1 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_command_handler.mm b/chrome/browser/ui/cocoa/browser_window_command_handler.mm
index 8697e32..4f88b46e4 100644
--- a/chrome/browser/ui/cocoa/browser_window_command_handler.mm
+++ b/chrome/browser/ui/cocoa/browser_window_command_handler.mm
@@ -16,6 +16,7 @@
 #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"
@@ -53,9 +54,8 @@ void UpdateToggleStateWithTag(NSInteger tag, id item, NSWindow* window) {
   }
 
   if (tag == IDC_TOGGLE_FULLSCREEN_TOOLBAR) {
-    BrowserWindowController* controller =
-        [browser->window()->GetNativeWindow() windowController];
-    SetToggleState([controller shouldHideFullscreenToolbar], item);
+    PrefService* prefs = browser->profile()->GetPrefs();
+    SetToggleState(prefs->GetBoolean(prefs::kHideFullscreenToolbar), item);
     return;
   }
 
@@ -173,7 +173,12 @@ Browser* FindBrowserForSender(id sender, NSWindow* window) {
     }
     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;
     }
@@ -209,13 +214,11 @@ Browser* FindBrowserForSender(id sender, NSWindow* window) {
       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