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

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 7740044: Implement fullscreen info bubble on Win and Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ups 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/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index de392e4824818cd8b5be2e24eb8bdf016a716ea9..51d3ec18a3f7af80c559d272965221e365d8ba18 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -687,7 +687,7 @@ void BrowserWindowGtk::SetBoundsImpl(const gfx::Rect& bounds,
void BrowserWindowGtk::SetBounds(const gfx::Rect& bounds) {
if (IsFullscreen())
- SetFullscreen(false);
+ SetFullscreen(false, GURL(), false);
SetBoundsImpl(bounds, true, true);
}
@@ -849,11 +849,21 @@ bool BrowserWindowGtk::ShouldDrawContentDropShadow() {
return !IsMaximized() && UseCustomFrame();
}
-void BrowserWindowGtk::SetFullscreen(bool fullscreen) {
+void BrowserWindowGtk::SetFullscreen(bool fullscreen, const GURL& url,
+ bool ask_permission) {
// gtk_window_(un)fullscreen asks the window manager to toggle the EWMH
// for fullscreen windows. Not all window managers support this.
if (fullscreen) {
gtk_window_fullscreen(window_);
+ bool is_kiosk =
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
+ if (!is_kiosk) {
+ fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk(
+ GTK_FLOATING_CONTAINER(render_area_floating_container_),
+ browser(),
+ url,
+ ask_permission));
+ }
} else {
// Work around a bug where if we try to unfullscreen, metacity immediately
// fullscreens us again. This is a little flickery and not necessary if

Powered by Google App Engine
This is Rietveld 408576698