Remove the Presentation Mode Command ID

chrome/browser/ui/cocoa/browser_window_command_handler.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h"
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
@@ skipping 81 matching lines @@
   if (BrowserWindowController* controller = [ns_window windowController]) {
     DCHECK(chrome::mac::SupportsSystemFullscreen());
     return l10n_util::GetNSString([controller isInAppKitFullscreen]
                                       ? IDS_EXIT_FULLSCREEN_MAC
                                       : IDS_ENTER_FULLSCREEN_MAC);
   }
 
   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.
 // Some senders don't have this problem (for example, menus only operate on the
 // foreground window), so this is only an issue for senders that are part of
 // windows.
 Browser* FindBrowserForSender(id sender, NSWindow* window) {
   NSWindow* targetWindow = window;
   if ([sender respondsToSelector:@selector(window)])
     targetWindow = [sender window];
@@ skipping 32 matching lines @@
   switch (tag) {
     case IDC_CLOSE_TAB:
       // Disable "close tab" if the receiving window is not tabbed.
       // We simply check whether the item has a keyboard shortcut set here;
       // app_controller_mac.mm actually determines whether the item should
       // be enabled.
       if (NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item))
         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: {
       Profile* original_profile = browser->profile()->GetOriginalProfile();
       [AppController updateSigninItem:item
                            shouldShow:enable
                        currentProfile:original_profile];
       content::RecordAction(
           base::UserMetricsAction("Signin_Impression_FromMenu"));
       break;
@@ skipping 13 matching lines @@
       // Extensions have the ability to hide the bookmark all tabs menu
       // item.  This only affects the bookmark page menu item under the main
       // menu.  The bookmark page menu item under the app menu has its
       // visibility controlled by AppMenuModel.
       bool shouldHide =
           chrome::ShouldRemoveBookmarkOpenPagesUI(browser->profile());
       NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item);
       [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.
       NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item);
       [menuItem setHidden:browser->is_type_tabbed() || browser->is_devtools()];
       break;
     }
     default:
       // Special handling for the contents of the Text Encoding submenu. On
       // Mac OS, instead of enabling/disabling the top-level menu item, we
@@ skipping 40 matching lines @@
     // the background" in this case.
     modifierFlags &= ~NSCommandKeyMask;
   }
   chrome::ExecuteCommandWithDisposition(
       FindBrowserForSender(sender, window), command,
       ui::WindowOpenDispositionFromNSEventWithFlags([NSApp currentEvent],
                                                     modifierFlags));
 }
 
 @end