Preference for Presentation Mode/Fullscreen Toolbar

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/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/user_metrics.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) {
@@ skipping 17 matching lines @@
   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) {
     SetToggleState(browser->window()->IsBookmarkBarVisible(), item);
     return;
   }
 
   if (tag == IDC_TOGGLE_FULLSCREEN_TOOLBAR) {
-    SetToggleState(browser->window()->ShouldHideFullscreenToolbar(), item);
+    PrefService* prefs = browser->profile()->GetPrefs();
+    SetToggleState(prefs->GetBoolean(prefs::kHideFullscreenToolbar), 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;
 
@@ skipping 97 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];
       content::RecordAction(
           base::UserMetricsAction("Signin_Impression_FromMenu"));
@@ skipping 15 matching lines @@
       // 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: {
-      // TODO(spqchan): Implement a preferences for this command and replace
-      // the Presentation Mode menu item with item.
-      if (NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item)) {
+      if (!chrome::mac::SupportsSystemFullscreen()) {
+        NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item);
         [menuItem setHidden:YES];
-        enable = false;
+        enable = NO;
       }
-      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);
   }
 
@@ skipping 34 matching lines @@
     // the background" in this case.
     modifierFlags &= ~NSCommandKeyMask;
   }
   chrome::ExecuteCommandWithDisposition(
       FindBrowserForSender(sender, window), command,
       ui::WindowOpenDispositionFromNSEventWithFlags([NSApp currentEvent],
                                                     modifierFlags));
 }
 
 @end