summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordewittj <dewittj@chromium.org>2015-09-22 14:17:31 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-22 21:36:50 +0000
commit680be266e4ccdf4f2ee0b4b75166e3eb8db2d6dd (patch)
tree76c16e38a06e3bc698b50d2f980cbe09a3c346d1
parent0a5ec125b8be475c39b6e41cc3c15c33fc7a9de5 (diff)
downloadchromium_src-680be266e4ccdf4f2ee0b4b75166e3eb8db2d6dd.zip
chromium_src-680be266e4ccdf4f2ee0b4b75166e3eb8db2d6dd.tar.gz
chromium_src-680be266e4ccdf4f2ee0b4b75166e3eb8db2d6dd.tar.bz2
Remove obsolete "Hide Notifications Icon" menu item.
The removal of the Mac notification center means that this item is no longer necessary. BUG=530376 Review URL: https://codereview.chromium.org/1355513005 Cr-Commit-Position: refs/heads/master@{#350232}
-rw-r--r--chrome/app/generated_resources.grd5
-rw-r--r--chrome/app/nibs/MainMenu.xib6
-rw-r--r--chrome/browser/app_controller_mac.h3
-rw-r--r--chrome/browser/app_controller_mac.mm9
4 files changed, 0 insertions, 23 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cbd4311..ca983bd 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7585,11 +7585,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_CONFIRM_TO_QUIT_OPTION" desc="The label of the checkbox preference that enables the confirm-to-quit feature.">
Warn Before Quitting (<ph name="KEY_EQUIVALENT">$1<ex>⌘Q</ex></ph>)
</message>
-
- <!-- Show/Hide notifications menubar extra -->
- <message name="IDS_HIDE_NOTIFICATION_CENTER_OPTION" desc="The label of the checkbox preference that disables the notification center feature.">
- Hide Notifications Icon
- </message>
</if>
<!-- Importer Lock Dialog -->
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index e12d70e..ed09364 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -84,12 +84,6 @@ CA
<action selector="toggleConfirmToQuit:" target="483" id="688"/>
</connections>
</menuItem>
- <menuItem title="^IDS_HIDE_NOTIFICATION_CENTER_OPTION" id="Uhg-Xg-lia">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="toggleDisplayMessageCenter:" target="483" id="5NG-Ev-pV2"/>
- </connections>
- </menuItem>
<menuItem isSeparatorItem="YES" id="686"/>
<menuItem title="^IDS_EXIT_MAC$IDS_PRODUCT_NAME" tag="34031" keyEquivalent="q" id="136">
<connections>
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index 9b640f2..b4bd634 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -147,9 +147,6 @@ class WorkAreaWatcherObserver;
// Toggles the "Confirm to Quit" preference.
- (IBAction)toggleConfirmToQuit:(id)sender;
-// Toggles the "Hide Notifications Icon" preference.
-- (IBAction)toggleDisplayMessageCenter:(id)sender;
-
// Delegate method to return the dock menu.
- (NSMenu*)applicationDockMenu:(NSApplication*)sender;
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 3203fbd..708f81e 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -998,10 +998,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
} else if (action == @selector(toggleConfirmToQuit:)) {
[self updateConfirmToQuitPrefMenuItem:static_cast<NSMenuItem*>(item)];
enable = YES;
- } else if (action == @selector(toggleDisplayMessageCenter:)) {
- // 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;
}
@@ -1457,11 +1453,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
prefService->SetBoolean(prefs::kConfirmToQuitEnabled, !enabled);
}
-- (IBAction)toggleDisplayMessageCenter:(id)sender {
- // 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.
- (void)commandFromDock:(id)sender {
[NSApp activateIgnoringOtherApps:YES];