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

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

Issue 10261011: Windowed mode mouse lock addded to fullscreen controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yzshen feedback addressed. Created 8 years, 8 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 c30674c868c2acf0b20a20f225959c9be4dc9dde..d8821789d7bb5701716ddf001955703c5a5ba48e 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -922,10 +922,19 @@ void BrowserWindowGtk::EnterFullscreen(
}
void BrowserWindowGtk::UpdateFullscreenExitBubbleContent(
- const GURL& url,
+ const GURL& url,
FullscreenExitBubbleType bubble_type) {
- if (fullscreen_exit_bubble_.get())
- fullscreen_exit_bubble_->UpdateContent(url, bubble_type);
+ if (bubble_type == FEB_TYPE_NONE) {
+ fullscreen_exit_bubble_.reset();
+ } else if (fullscreen_exit_bubble_.get()) {
+ fullscreen_exit_bubble_->UpdateContent(url, bubble_type);
+ } else {
+ fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk(
+ GTK_FLOATING_CONTAINER(render_area_floating_container_),
+ browser(),
+ url,
+ bubble_type));
+ }
}
void BrowserWindowGtk::ExitFullscreen() {

Powered by Google App Engine
This is Rietveld 408576698