Switch to Cocoa APIs for fullscreen.

base/mac/mac_util.mm

 // Copyright (c) 2012 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.
 
 #include "base/mac/mac_util.h"
 
 #import <Cocoa/Cocoa.h>
 #import <IOKit/IOKitLib.h>
 
 #include <errno.h>
@@ skipping 13 matching lines @@
 #include "base/string_piece.h"
 #include "base/sys_string_conversions.h"
 
 namespace base {
 namespace mac {
 
 namespace {
 
 // The current count of outstanding requests for full screen mode from browser
 // windows, plugins, etc.
-int g_full_screen_requests[kNumFullScreenModes] = { 0, 0, 0};
+int g_full_screen_requests[kNumFullScreenModes] = { 0 };
 
-// Sets the appropriate SystemUIMode based on the current full screen requests.
-// Since only one SystemUIMode can be active at a given time, full screen
-// requests are ordered by priority.  If there are no outstanding full screen
-// requests, reverts to normal mode.  If the correct SystemUIMode is already
-// set, does nothing.
+// Sets the appropriate application presentation option based on the current
+// full screen requests.  Since only one presentation option can be active at a
+// given time, full screen requests are ordered by priority.  If there are no
+// outstanding full screen requests, reverts to normal mode.  If the correct
+// presentation option is already set, does nothing.
 void SetUIMode() {
-  // Get the current UI mode.
-  SystemUIMode current_mode;
-  GetSystemUIMode(&current_mode, NULL);
+  NSApplicationPresentationOptions current_options =
+      [NSApp presentationOptions];
 
   // Determine which mode should be active, based on which requests are
   // currently outstanding.  More permissive requests take precedence.  For
   // example, plugins request |kFullScreenModeAutoHideAll|, while browser
   // windows request |kFullScreenModeHideDock| when the fullscreen overlay is
   // down.  Precedence goes to plugins in this case, so AutoHideAll wins over
   // HideDock.
-  SystemUIMode desired_mode = kUIModeNormal;
-  SystemUIOptions desired_options = 0;
+  NSApplicationPresentationOptions desired_options =
+      NSApplicationPresentationDefault;
   if (g_full_screen_requests[kFullScreenModeAutoHideAll] > 0) {
-    desired_mode = kUIModeAllHidden;
-    desired_options = kUIOptionAutoShowMenuBar;
+    desired_options = NSApplicationPresentationHideDock |
+                      NSApplicationPresentationAutoHideMenuBar;
   } else if (g_full_screen_requests[kFullScreenModeHideDock] > 0) {
-    desired_mode = kUIModeContentHidden;
+    desired_options = NSApplicationPresentationHideDock;
   } else if (g_full_screen_requests[kFullScreenModeHideAll] > 0) {
-    desired_mode = kUIModeAllHidden;
+    desired_options = NSApplicationPresentationHideDock |
+                      NSApplicationPresentationHideMenuBar;
   }
 
-  if (current_mode != desired_mode)
-    SetSystemUIMode(desired_mode, desired_options);
+  if (current_options != desired_options)
+    [NSApp setPresentationOptions:desired_options];
 }
 
 // Looks into Shared File Lists corresponding to Login Items for the item
 // representing the current application.  If such an item is found, returns a
 // retained reference to it. Caller is responsible for releasing the reference.
 LSSharedFileListItemRef GetLoginItemForApp() {
   ScopedCFTypeRef<LSSharedFileListRef> login_items(LSSharedFileListCreate(
       NULL, kLSSharedFileListSessionLoginItems, NULL));
 
   if (!login_items.get()) {
@@ skipping 591 matching lines @@
           StringPiece(begin + comma_loc + 1, ident.end()), &minor_tmp))
     return false;
   *type = ident.substr(0, number_loc);
   *major = major_tmp;
   *minor = minor_tmp;
   return true;
 }
 
 }  // namespace mac
 }  // namespace base