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 a0c1b50704701dacd8920daf320b8158010aeba2..32b59932dcfac8cf2b8cd60375ae207aac083f95 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,20 @@ bool BrowserWindowGtk::ShouldDrawContentDropShadow() { |
return !IsMaximized() && UseCustomFrame(); |
} |
-void BrowserWindowGtk::SetFullscreen(bool fullscreen) { |
+void BrowserWindowGtk::SetFullscreen(bool fullscreen, const GURL& url, bool show_buttons) { |
// 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, |
+ show_buttons)); |
+ } |
} 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 |