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

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

Issue 7740044: Implement fullscreen info bubble on Win and Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: windows compile fix Created 9 years, 2 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_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index a35da2fd04f8251843ad406555ce6abd46575a2d..e25385a542e94c27ea51e7b1f2b1888424617818 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,16 @@ 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
+ url:url
+ askPermission:ask_permission];
+}
+
+void BrowserWindowCocoa::ExitFullscreen() {
+ [controller_ setFullscreen:NO
+ url:GURL()
+ askPermission:NO];
}
bool BrowserWindowCocoa::IsFullscreen() const {
@@ -502,8 +510,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() {

Powered by Google App Engine
This is Rietveld 408576698