| Index: chrome/browser/app_controller_mac.mm
|
| diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
|
| index 0b290319d87e3800626160965fe15b718cc8b9a5..b67cfba7c774eaf96e6e3faa896e99ce4f023569 100644
|
| --- a/chrome/browser/app_controller_mac.mm
|
| +++ b/chrome/browser/app_controller_mac.mm
|
| @@ -212,7 +212,6 @@ bool IsProfileSignedOut(Profile* profile) {
|
| - (void)initMenuState;
|
| - (void)initProfileMenu;
|
| - (void)updateConfirmToQuitPrefMenuItem:(NSMenuItem*)item;
|
| -- (void)updateDisplayMessageCenterPrefMenuItem:(NSMenuItem*)item;
|
| - (void)registerServicesMenuTypesTo:(NSApplication*)app;
|
| - (void)getUrl:(NSAppleEventDescriptor*)event
|
| withReply:(NSAppleEventDescriptor*)reply;
|
| @@ -1000,9 +999,9 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
|
| [self updateConfirmToQuitPrefMenuItem:static_cast<NSMenuItem*>(item)];
|
| enable = YES;
|
| } else if (action == @selector(toggleDisplayMessageCenter:)) {
|
| - NSMenuItem* menuItem = static_cast<NSMenuItem*>(item);
|
| - [self updateDisplayMessageCenterPrefMenuItem:menuItem];
|
| - enable = YES;
|
| + // TODO(dewittj): Remove this (see crbug.com/530376) with a separate update
|
| + // to the xib file.
|
| + enable = NO;
|
| } else if (action == @selector(executeApplication:)) {
|
| enable = YES;
|
| }
|
| @@ -1326,14 +1325,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
|
| [item setState:enabled ? NSOnState : NSOffState];
|
| }
|
|
|
| -- (void)updateDisplayMessageCenterPrefMenuItem:(NSMenuItem*)item {
|
| - const PrefService* prefService = g_browser_process->local_state();
|
| - bool enabled = prefService->GetBoolean(prefs::kMessageCenterShowIcon);
|
| - // The item should be checked if "show icon" is false, since the text reads
|
| - // "Hide notification center icon."
|
| - [item setState:enabled ? NSOffState : NSOnState];
|
| -}
|
| -
|
| - (void)registerServicesMenuTypesTo:(NSApplication*)app {
|
| // Note that RenderWidgetHostViewCocoa implements NSServicesRequests which
|
| // handles requests from services.
|
| @@ -1467,9 +1458,8 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
|
| }
|
|
|
| - (IBAction)toggleDisplayMessageCenter:(id)sender {
|
| - PrefService* prefService = g_browser_process->local_state();
|
| - bool enabled = prefService->GetBoolean(prefs::kMessageCenterShowIcon);
|
| - prefService->SetBoolean(prefs::kMessageCenterShowIcon, !enabled);
|
| + // TODO(dewittj): Remove this (see crbug.com/530376) with a separate update to
|
| + // the xib file.
|
| }
|
|
|
| // Explicitly bring to the foreground when creating new windows from the dock.
|
|
|