Implement a Menu Item to Hide the Toolbar in Fullscreen

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"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
+void SetToggleState(bool toggled, id item) {
+  DCHECK([item respondsToSelector:@selector(state)] &&
+         [item respondsToSelector:@selector(setState:)]);
+
+  NSInteger oldState = [item state];
+  NSInteger newState = toggled ? NSOnState : NSOffState;
+  if (oldState != newState)
+    [item setState:newState];
+}
+
 // Update a toggle state for an item if modified. The item may be an NSMenuItem
 // or NSButton. Called by -validateUserInterfaceItem:.
 void UpdateToggleStateWithTag(NSInteger tag, id item, NSWindow* window) {
   if (![item respondsToSelector:@selector(state)] ||
       ![item respondsToSelector:@selector(setState:)])
     return;
 
   Browser* browser = chrome::FindBrowserWithWindow(window);
   DCHECK(browser);
 
   // On Windows this logic happens in bookmark_bar_view.cc. This simply updates
   // the menu item; it does not display the bookmark bar itself.
   if (tag == IDC_SHOW_BOOKMARK_BAR) {
-    bool toggled = browser->window()->IsBookmarkBarVisible();
-    NSInteger oldState = [item state];
-    NSInteger newState = toggled ? NSOnState : NSOffState;
-    if (oldState != newState)
-      [item setState:newState];
+    SetToggleState(browser->window()->IsBookmarkBarVisible(), item);
     return;
   }
 
+  if (tag == IDC_TOGGLE_FULLSCREEN_TOOLBAR) {
+    SetToggleState(browser->window()->ShouldHideFullscreenToolbar(), item);
+    return;
+  }
+
   // Update the checked/unchecked state of items in the encoding menu.
   // On Windows, this logic is part of |EncodingMenuModel| in
   // browser/ui/views/toolbar_view.h.
   EncodingMenuController encoding_controller;
   if (!encoding_controller.DoesCommandBelongToEncodingMenu(tag))
     return;
 
   Profile* profile = browser->profile();
   DCHECK(profile);
   content::WebContents* current_tab =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!current_tab)
     return;
 
   const std::string encoding = current_tab->GetEncoding();
 
-  bool toggled = encoding_controller.IsItemChecked(profile, encoding, tag);
-  NSInteger oldState = [item state];
-  NSInteger newState = toggled ? NSOnState : NSOffState;
-  if (oldState != newState)
-    [item setState:newState];
+  SetToggleState(encoding_controller.IsItemChecked(profile, encoding, tag),
+                 item);
 }
 
 NSString* GetTitleForViewsFullscreenMenuItem(Browser* browser) {
   return l10n_util::GetNSString(browser->window()->IsFullscreen()
                                     ? IDS_EXIT_FULLSCREEN_MAC
                                     : IDS_ENTER_FULLSCREEN_MAC);
 }
 
 // Get the text for the "Enter/Exit Fullscreen" menu item.
 // TODO(jackhou): Remove the dependency on BrowserWindowController(Private).
 NSString* GetTitleForFullscreenMenuItem(Browser* browser) {
   NSWindow* ns_window = browser->window()->GetNativeWindow();
   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 l10n_util::GetNSString([controller inPresentationMode]
+                                      ? IDS_EXIT_PRESENTATION_MAC
+                                      : IDS_ENTER_PRESENTATION_MAC);
   }
-
-  return GetTitleForViewsFullscreenMenuItem(browser);
+  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;
@@ skipping 44 matching lines @@
       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)) {
-        [menuItem setTitle:GetTitleForPresentationModeMenuItem(browser)];
+        if (chrome::mac::SupportsSystemFullscreen()) {
+          [menuItem setHidden:YES];
+          enable = NO;
+        } else {
+          [menuItem setTitle:GetTitleForPresentationModeMenuItem(browser)];
+        }
       }
       break;
     }
     case IDC_SHOW_SIGNIN: {
       Profile* original_profile = browser->profile()->GetOriginalProfile();
       [AppController updateSigninItem:item
                            shouldShow:enable
                        currentProfile:original_profile];
       break;
     }
@@ skipping 12 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 wrench menu has its
       // visibility controlled by WrenchMenuModel.
       bool shouldHide =
           chrome::ShouldRemoveBookmarkOpenPagesUI(browser->profile());
       NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item);
       [menuItem setHidden:shouldHide];
       break;
     }
+    case IDC_TOGGLE_FULLSCREEN_TOOLBAR: {

[Robert Sesek, 2015/11/04 21:57:16]

Maybe make this item unconditionally disabled or hidden until it actually does
something?

[spqchan, 2015/11/04 23:59:21]

Done.

+      NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item);
+      if (chrome::mac::SupportsSystemFullscreen()) {
+        BOOL isFullscreenToolbarHidden = NO;

[Robert Sesek, 2015/11/04 21:57:16]

Should there be a TODO for this?

[spqchan, 2015/11/04 23:59:21]

Done.

+        [menuItem setState:isFullscreenToolbarHidden];
+      } else {
+        [menuItem setHidden:YES];
+      }
+      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
       // enable/disable the submenu's contents (per Apple's HIG).
       EncodingMenuController encoding_controller;
       if (encoding_controller.DoesCommandBelongToEncodingMenu(tag))
         enable &= chrome::IsCommandEnabled(browser, IDC_ENCODING_MENU);
   }
 
   // If the item is toggleable, find its toggle state and
@@ skipping 33 matching lines @@
     // the background" in this case.
     modifierFlags &= ~NSCommandKeyMask;
   }
   chrome::ExecuteCommandWithDisposition(
       FindBrowserForSender(sender, window), command,
       ui::WindowOpenDispositionFromNSEventWithFlags([NSApp currentEvent],
                                                     modifierFlags));
 }
 
 @end