Add profile selector to dock menu.
BUG=142446
TEST=as in bug
Review URL: https://chromiumcodereview.appspot.com/10874004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153043 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 52f8f95..ada56f8 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -1197,20 +1197,28 @@
NSMenu* dockMenu = [[[NSMenu alloc] initWithTitle: @""] autorelease];
Profile* profile = [self lastProfile];
- NSString* titleStr = l10n_util::GetNSStringWithFixup(IDS_NEW_WINDOW_MAC);
+ BOOL handled = [profileMenuController_ insertItemsIntoMenu:dockMenu
+ atOffset:0
+ fromDock:YES];
+
+ if (!handled) {
+ NSString* titleStr = l10n_util::GetNSStringWithFixup(IDS_NEW_WINDOW_MAC);
+ scoped_nsobject<NSMenuItem> item(
+ [[NSMenuItem alloc] initWithTitle:titleStr
+ action:@selector(commandFromDock:)
+ keyEquivalent:@""]);
+ [item setTarget:self];
+ [item setTag:IDC_NEW_WINDOW];
+ [dockMenu addItem:item];
+ }
+
+ NSString* titleStr =
+ l10n_util::GetNSStringWithFixup(IDS_NEW_INCOGNITO_WINDOW_MAC);
scoped_nsobject<NSMenuItem> item(
[[NSMenuItem alloc] initWithTitle:titleStr
action:@selector(commandFromDock:)
keyEquivalent:@""]);
[item setTarget:self];
- [item setTag:IDC_NEW_WINDOW];
- [dockMenu addItem:item];
-
- titleStr = l10n_util::GetNSStringWithFixup(IDS_NEW_INCOGNITO_WINDOW_MAC);
- item.reset([[NSMenuItem alloc] initWithTitle:titleStr
- action:@selector(commandFromDock:)
- keyEquivalent:@""]);
- [item setTarget:self];
[item setTag:IDC_NEW_INCOGNITO_WINDOW];
[dockMenu addItem:item];
