Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3262)

Unified Diff: base/mac/mac_util.mm

Issue 11947002: Switch back to deprecated fullscreen APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/fullscreen_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/mac/mac_util.mm
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
index a0fee532435058b4e64ff52b061bd2a3870d7d3e..8870dc0ac23f4b4816ddd7bc9dea3dbb07e70f4c 100644
--- a/base/mac/mac_util.mm
+++ b/base/mac/mac_util.mm
@@ -31,16 +31,17 @@ namespace {
// The current count of outstanding requests for full screen mode from browser
// windows, plugins, etc.
-int g_full_screen_requests[kNumFullScreenModes] = { 0 };
+int g_full_screen_requests[kNumFullScreenModes] = { 0, 0, 0};
-// 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.
+// 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.
void SetUIMode() {
- NSApplicationPresentationOptions current_options =
- [NSApp presentationOptions];
+ // Get the current UI mode.
+ SystemUIMode current_mode;
+ GetSystemUIMode(&current_mode, NULL);
// Determine which mode should be active, based on which requests are
// currently outstanding. More permissive requests take precedence. For
@@ -48,20 +49,19 @@ void SetUIMode() {
// windows request |kFullScreenModeHideDock| when the fullscreen overlay is
// down. Precedence goes to plugins in this case, so AutoHideAll wins over
// HideDock.
- NSApplicationPresentationOptions desired_options =
- NSApplicationPresentationDefault;
+ SystemUIMode desired_mode = kUIModeNormal;
+ SystemUIOptions desired_options = 0;
if (g_full_screen_requests[kFullScreenModeAutoHideAll] > 0) {
- desired_options = NSApplicationPresentationHideDock |
- NSApplicationPresentationAutoHideMenuBar;
+ desired_mode = kUIModeAllHidden;
+ desired_options = kUIOptionAutoShowMenuBar;
} else if (g_full_screen_requests[kFullScreenModeHideDock] > 0) {
- desired_options = NSApplicationPresentationHideDock;
+ desired_mode = kUIModeContentHidden;
} else if (g_full_screen_requests[kFullScreenModeHideAll] > 0) {
- desired_options = NSApplicationPresentationHideDock |
- NSApplicationPresentationHideMenuBar;
+ desired_mode = kUIModeAllHidden;
}
- if (current_options != desired_options)
- [NSApp setPresentationOptions:desired_options];
+ if (current_mode != desired_mode)
+ SetSystemUIMode(desired_mode, desired_options);
}
// Looks into Shared File Lists corresponding to Login Items for the item
« no previous file with comments | « no previous file | chrome/browser/fullscreen_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698