Index: chrome/browser/ui/cocoa/browser_window_command_handler.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_command_handler.mm b/chrome/browser/ui/cocoa/browser_window_command_handler.mm |
index 50fbb6a3d042bacd9e5d2bc521529f4ed6522ce1..366154826429c180e825eeea35bd0ae93fce8235 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_command_handler.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_command_handler.mm |
@@ -99,18 +99,6 @@ NSString* GetTitleForFullscreenMenuItem(Browser* browser) { |
return GetTitleForViewsFullscreenMenuItem(browser); |
} |
-// Get the text for the "Enter/Exit Presentation Mode" menu item. |
-// TODO(jackhou): Remove the dependency on BrowserWindowController(Private). |
-NSString* GetTitleForPresentationModeMenuItem(Browser* browser) { |
- NSWindow* ns_window = browser->window()->GetNativeWindow(); |
- if (BrowserWindowController* controller = [ns_window windowController]) { |
- return l10n_util::GetNSString([controller inPresentationMode] |
- ? IDS_EXIT_PRESENTATION_MAC |
- : IDS_ENTER_PRESENTATION_MAC); |
- } |
- return GetTitleForFullscreenMenuItem(browser); |
-} |
- |
// Identify the actual Browser to which the command should be dispatched. It |
// might belong to a background window, yet another dispatcher gets it because |
// it is the foreground window's dispatcher and thus in the responder chain. |
@@ -163,23 +151,8 @@ Browser* FindBrowserForSender(id sender, NSWindow* window) { |
enable &= !![[menuItem keyEquivalent] length]; |
break; |
case IDC_FULLSCREEN: { |
- if (NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item)) { |
- if (chrome::mac::SupportsSystemFullscreen()) |
- [menuItem setTitle:GetTitleForFullscreenMenuItem(browser)]; |
- else |
- [menuItem setHidden:YES]; |
- } |
- break; |
- } |
- case IDC_PRESENTATION_MODE: { |
- if (NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item)) { |
- if (chrome::mac::SupportsSystemFullscreen()) { |
- [menuItem setHidden:YES]; |
- enable = NO; |
- } else { |
- [menuItem setTitle:GetTitleForPresentationModeMenuItem(browser)]; |
- } |
- } |
+ if (NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item)) |
+ [menuItem setTitle:GetTitleForFullscreenMenuItem(browser)]; |
break; |
} |
case IDC_SHOW_SIGNIN: { |
@@ -213,14 +186,6 @@ Browser* FindBrowserForSender(id sender, NSWindow* window) { |
[menuItem setHidden:shouldHide]; |
break; |
} |
- case IDC_TOGGLE_FULLSCREEN_TOOLBAR: { |
- if (!chrome::mac::SupportsSystemFullscreen()) { |
- NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item); |
- [menuItem setHidden:YES]; |
- enable = NO; |
- } |
- break; |
- } |
case IDC_SHOW_AS_TAB: { |
// Hide this menu option if the window is tabbed or is the devtools |
// window. |