Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
index 81637ba5c7ffe1f584738000272f2354367aee7a..47e440fe1d5a03fa2c5192bc9cd3319e09a36070 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
@@ -134,7 +134,7 @@ void BrowserWindowCocoa::ShowInactive() { |
void BrowserWindowCocoa::SetBounds(const gfx::Rect& bounds) { |
gfx::Rect real_bounds = [controller_ enforceMinWindowSize:bounds]; |
- SetFullscreen(false); |
+ SetFullscreen(false, GURL(), false); |
NSRect cocoa_bounds = NSMakeRect(real_bounds.x(), 0, |
real_bounds.width(), |
real_bounds.height()); |
@@ -255,8 +255,11 @@ bool BrowserWindowCocoa::IsMinimized() const { |
return [window() isMiniaturized]; |
} |
-void BrowserWindowCocoa::SetFullscreen(bool fullscreen) { |
- [controller_ setFullscreen:fullscreen]; |
+void BrowserWindowCocoa::SetFullscreen(bool fullscreen, const GURL& url, |
+ bool ask_permission) { |
+ [controller_ setFullscreen:fullscreen |
+ forURL:url |
+ askPermission:ask_permission]; |
} |
bool BrowserWindowCocoa::IsFullscreen() const { |
@@ -502,8 +505,12 @@ void BrowserWindowCocoa::OpenTabpose() { |
[controller_ openTabpose]; |
} |
-void BrowserWindowCocoa::SetPresentationMode(bool presentation_mode) { |
- [controller_ setPresentationMode:presentation_mode]; |
+void BrowserWindowCocoa::SetPresentationMode(bool presentation_mode, |
+ const GURL& url, |
+ bool ask_permission) { |
+ [controller_ setPresentationMode:presentation_mode |
+ url:url |
+ askPermission:ask_permission]; |
} |
bool BrowserWindowCocoa::InPresentationMode() { |