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 2db44e052a98666005f3d2fac897df1c698ac459..dbb110ff34114b58653fb610a60da579032b6c55 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm |
@@ -1903,7 +1903,9 @@ willAnimateFromState:(bookmarks::VisualState)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 { |
+- (void)setFullscreen:(BOOL)fullscreen |
+ forURL:(const GURL&)url |
+ askPermission:(BOOL)ask_permission { |
Nico
2011/10/12 16:23:09
and here (and below)
jeremya
2011/10/13 05:16:54
Done.
|
if (fullscreen == [self isFullscreen]) |
return; |
@@ -1921,8 +1923,9 @@ willAnimateFromState:(bookmarks::VisualState)oldState |
[self exitFullscreenForSnowLeopardOrEarlier]; |
} |
- if (fullscreen) { |
- [self showFullscreenExitBubbleIfNecessary]; |
+ if (fullscreen && !url.is_empty()) { |
+ [self showFullscreenExitBubbleIfNecessaryWithURL:url |
+ askPermission:ask_permission]; |
} else { |
[self destroyFullscreenExitBubbleIfNecessary]; |
} |
@@ -1946,11 +1949,13 @@ willAnimateFromState:(bookmarks::VisualState)oldState |
// set presentation mode. On Snow Leopard, this function is called by the |
// "Enter Presentation Mode" menu item, and triggering presentation mode always |
// moves the user into fullscreen mode. |
-- (void)setPresentationMode:(BOOL)presentationMode { |
+- (void)setPresentationMode:(BOOL)presentationMode |
+ url:(const GURL&)url |
+ askPermission:(BOOL)ask_permission { |
// Presentation mode on Leopard and Snow Leopard maps directly to fullscreen |
// mode. |
if (base::mac::IsOSSnowLeopardOrEarlier()) { |
- [self setFullscreen:presentationMode]; |
+ [self setFullscreen:presentationMode forURL:url askPermission:ask_permission]; |
Nico
2011/10/12 16:23:09
80 cols
jeremya
2011/10/13 05:16:54
Done.
|
return; |
} |
@@ -1981,7 +1986,8 @@ willAnimateFromState:(bookmarks::VisualState)oldState |
[static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen]; |
} |
- [self showFullscreenExitBubbleIfNecessary]; |
+ [self showFullscreenExitBubbleIfNecessaryWithURL:url |
+ askPermission:ask_permission]; |
Nico
2011/10/12 16:23:09
align :
jeremya
2011/10/13 05:16:54
Done.
|
} else { |
if (enteredPresentationModeFromFullscreen_) { |
// The window is currently in fullscreen mode, but the user is choosing to |