Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3075)

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 12259032: [Mac] Fix background apps dock menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 01642fd47cfa678eafd67c95655f28dde8a110fc..483f20e56b17885ff9efa6220c031fa931b35b59 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -807,6 +807,8 @@ void RecordLastRunAppBundlePath() {
} else if (action == @selector(toggleConfirmToQuit:)) {
[self updateConfirmToQuitPrefMenuItem:static_cast<NSMenuItem*>(item)];
enable = YES;
+ } else if (action == @selector(executeApplication:)) {
+ enable = YES;
}
return enable;
}
@@ -932,12 +934,6 @@ void RecordLastRunAppBundlePath() {
case IDC_OPTIONS:
[self showPreferences:sender];
break;
- default:
- // Background Applications use dynamic values that must be less than the
- // smallest value among the predefined IDC_* labels.
- if ([sender tag] < IDC_MinimumLabelValue)
- [self executeApplication:sender];
- break;
}
}
@@ -1288,7 +1284,7 @@ void RecordLastRunAppBundlePath() {
l10n_util::GetNSStringWithFixup(IDS_BACKGROUND_APPS_MAC);
scoped_nsobject<NSMenu> appMenu([[NSMenu alloc] initWithTitle:menuStr]);
for (extensions::ExtensionList::const_iterator cursor =
- applications.begin();
+ applications.begin();
cursor != applications.end();
++cursor, ++position) {
DCHECK_EQ(applications.GetPosition(*cursor), position);
@@ -1296,18 +1292,19 @@ void RecordLastRunAppBundlePath() {
base::SysUTF16ToNSString(UTF8ToUTF16((*cursor)->name()));
scoped_nsobject<NSMenuItem> appItem([[NSMenuItem alloc]
initWithTitle:itemStr
- action:@selector(commandFromDock:)
+ action:@selector(executeApplication:)
keyEquivalent:@""]);
[appItem setTarget:self];
[appItem setTag:position];
[appMenu addItem:appItem];
}
+
scoped_nsobject<NSMenuItem> appMenuItem([[NSMenuItem alloc]
initWithTitle:menuStr
- action:@selector(commandFromDock:)
+ action:@selector(executeApplication:)
keyEquivalent:@""]);
[appMenuItem setTarget:self];
- [appMenuItem setTag:position];
+ [appMenuItem setTag:IDC_VIEW_BACKGROUND_PAGES];
[appMenuItem setSubmenu:appMenu];
[dockMenu addItem:appMenuItem];
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698