diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 19:00:33 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 19:00:33 +0000 |
| commit | 3d272f5a5e6fc0252ee00aaf56a0d123144ac98f (patch) | |
| tree | d9d42da61fb9c9ae8194741c94a98ad1aa393576 /chrome/browser/app_controller_mac.mm | |
| parent | d6a0e9a517ead862e24c63ff185007c860f62253 (diff) | |
| download | chromium_src-3d272f5a5e6fc0252ee00aaf56a0d123144ac98f.zip chromium_src-3d272f5a5e6fc0252ee00aaf56a0d123144ac98f.tar.gz chromium_src-3d272f5a5e6fc0252ee00aaf56a0d123144ac98f.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 26 |
1 files changed, 17 insertions, 9 deletions
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 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; 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]; |