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

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: indent Created 8 years, 7 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
« no previous file with comments | « chrome/browser/ui/fullscreen_controller.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 85ba20ee72c0ceb139661f9b3350d5c9973b5b79..60fe1a79b1d7277e316b52fd082ba3349fab0f09 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -926,10 +926,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() {
« no previous file with comments | « chrome/browser/ui/fullscreen_controller.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698