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

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

Issue 12018007: Refactor BrowserWindow fullscreen and presentation on Mac to be consistent with other platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge TOT 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
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 384a536d76c8614614f699b56725bfdd0410ebb6..70f82097859fa7590e1bbca2e41b5b1e2c56a981 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -2007,9 +2007,7 @@ willAnimateFromState:(BookmarkBar::State)oldState
// "Enter Full Screen" menu item. On Snow Leopard, this function is never
// called by the UI directly, but it provides the implementation for
// |-setPresentationMode:|.
-- (void)setFullscreen:(BOOL)fullscreen
- url:(const GURL&)url
- bubbleType:(FullscreenExitBubbleType)bubbleType {
+- (void)setFullscreen:(BOOL)fullscreen {
if (fullscreen == [self isFullscreen])
return;
@@ -2028,14 +2026,12 @@ willAnimateFromState:(BookmarkBar::State)oldState
}
}
-- (void)enterFullscreenForURL:(const GURL&)url
- bubbleType:(FullscreenExitBubbleType)bubbleType {
- [self setFullscreen:YES url:url bubbleType:bubbleType];
+- (void)enterFullscreen {
+ [self setFullscreen:YES];
}
- (void)exitFullscreen {
- // url: and bubbleType: are ignored when leaving fullscreen.
- [self setFullscreen:NO url:GURL() bubbleType:FEB_TYPE_NONE];
+ [self setFullscreen:NO];
}
- (void)updateFullscreenExitBubbleURL:(const GURL&)url
@@ -2065,7 +2061,7 @@ willAnimateFromState:(BookmarkBar::State)oldState
// Presentation mode on Snow Leopard maps directly to fullscreen mode.
if (base::mac::IsOSSnowLeopard()) {
- [self setFullscreen:presentationMode url:url bubbleType:bubbleType];
+ [self setFullscreen:presentationMode];
return;
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698