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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 836933005: Refactor fullscreen_controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to TOT Created 5 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
Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index f2c086b0882389ef0b9d17fde3ed128909913441..1ed775b94c712b877308ada24d4dcebdcec701d6 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -426,8 +426,9 @@ willPositionSheet:(NSWindow*)sheet
}
- (void)configurePresentationModeController {
- BOOL fullscreen_for_tab =
- browser_->fullscreen_controller()->IsWindowFullscreenForTabOrPending();
+ BOOL fullscreen_for_tab = browser_->exclusive_access_manager()
+ ->fullscreen_controller()
+ ->IsWindowFullscreenForTabOrPending();
BOOL kiosk_mode =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
BOOL showDropdown =
@@ -670,7 +671,9 @@ willPositionSheet:(NSWindow*)sheet
NSWindow* window = [self window];
savedRegularWindowFrame_ = [window frame];
BOOL mode = enteringPresentationMode_ ||
- browser_->fullscreen_controller()->IsWindowFullscreenForTabOrPending();
+ browser_->exclusive_access_manager()
+ ->fullscreen_controller()
+ ->IsWindowFullscreenForTabOrPending();
enteringAppKitFullscreen_ = YES;
enteringAppKitFullscreenOnPrimaryScreen_ =
[[[self window] screen] isEqual:[[NSScreen screens] objectAtIndex:0]];
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698