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 a35da2fd04f8251843ad406555ce6abd46575a2d..4b497f079750c55c5aa20109a594b23ada734531 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); |
+ ExitFullscreen(); |
NSRect cocoa_bounds = NSMakeRect(real_bounds.x(), 0, |
real_bounds.width(), |
real_bounds.height()); |
@@ -255,8 +255,15 @@ bool BrowserWindowCocoa::IsMinimized() const { |
return [window() isMiniaturized]; |
} |
-void BrowserWindowCocoa::SetFullscreen(bool fullscreen) { |
- [controller_ setFullscreen:fullscreen]; |
+void BrowserWindowCocoa::EnterFullscreen(const GURL& url, bool ask_permission) { |
+ [controller_ setFullscreen:YES |
+ forURL:url |
+ askPermission:ask_permission]; |
+} |
Nico
2011/10/13 05:24:10
newline
koz (OOO until 15th September)
2011/10/13 06:09:43
Done.
|
+void BrowserWindowCocoa::ExitFullscreen() { |
+ [controller_ setFullscreen:NO |
+ forURL:GURL() |
+ askPermission:NO]; |
} |
bool BrowserWindowCocoa::IsFullscreen() const { |
@@ -502,8 +509,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]; |
Scott Hess - ex-Googler
2011/10/13 20:30:27
Indentation.
koz (OOO until 15th September)
2011/10/14 00:35:16
Done.
|
} |
bool BrowserWindowCocoa::InPresentationMode() { |