Change fullscreen mode to be determined by the window manager.

chrome/browser/gtk/browser_window_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/resource_bundle.h"
@@ skipping 360 matching lines @@
   }
   return GDK_LAST_CURSOR;
 }
 
 }  // namespace
 
 std::map<XID, GtkWindow*> BrowserWindowGtk::xid_map_;
 
 BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
     :  browser_(browser),
-       full_screen_(false),
 #if defined(OS_CHROMEOS)
        drag_active_(false),
        panel_controller_(NULL),
 #endif
        frame_cursor_(NULL),
        is_active_(true) {
   use_custom_frame_.Init(prefs::kUseCustomChromeFrame,
       browser_->profile()->GetPrefs(), this);
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
   g_object_set_data(G_OBJECT(window_), kBrowserWindowKey, this);
@@ skipping 248 matching lines @@
 
 gfx::Rect BrowserWindowGtk::GetNormalBounds() const {
   return bounds_;
 }
 
 bool BrowserWindowGtk::IsMaximized() const {
   return (state_ & GDK_WINDOW_STATE_MAXIMIZED);
 }
 
 void BrowserWindowGtk::SetFullscreen(bool fullscreen) {
-  full_screen_ = fullscreen;
-  UpdateCustomFrame();
-
+  // gtk_window_(un)fullscreen asks the window manager to toggle the EWMH
+  // for fullscreen windows.  Not all window managers support this.
   if (fullscreen) {
-    // These four balanced by ShowSupportedWindowFeatures().
-    toolbar_->Hide();
-    tabstrip_->Hide();
-    bookmark_bar_->Hide(false);
-    extension_shelf_->Hide();
-
     gtk_window_fullscreen(window_);
   } else {
-    ShowSupportedWindowFeatures();
-
     gtk_window_unfullscreen(window_);
   }
 }
 
 bool BrowserWindowGtk::IsFullscreen() const {
-  return full_screen_;
+  return (state_ & GDK_WINDOW_STATE_FULLSCREEN);
 }
 
 LocationBar* BrowserWindowGtk::GetLocationBar() const {
   return toolbar_->GetLocationBar();
 }
 
 void BrowserWindowGtk::SetFocusToLocationBar() {
   GetLocationBar()->FocusLocation();
 }
 
@@ skipping 209 matching lines @@
 }
 
 void BrowserWindowGtk::TabStripEmpty() {
   UpdateUIForContents(NULL);
 }
 
 void BrowserWindowGtk::MaybeShowBookmarkBar(TabContents* contents,
                                             bool animate) {
   // Don't change the visibility state when the browser is full screen or if
   // the bookmark bar isn't supported.
-  if (full_screen_ || !IsBookmarkBarSupported())
+  if (IsFullscreen() || !IsBookmarkBarSupported())
     return;
 
   bool show_bar = false;
 
   if (browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)
       && contents) {
     bookmark_bar_->SetProfile(contents->profile());
     bookmark_bar_->SetPageNavigator(contents);
     show_bar = true;
   }
@@ skipping 53 matching lines @@
 
 void BrowserWindowGtk::OnBoundsChanged(const gfx::Rect& bounds) {
   if (bounds_.size() != bounds.size())
     OnSizeChanged(bounds.width(), bounds.height());
 
   bounds_ = bounds;
   SaveWindowPosition();
 }
 
 void BrowserWindowGtk::OnStateChanged(GdkWindowState state) {
+  // If we care about more than full screen changes, we should pass through
+  // |changed_mask| from GdkEventWindowState.
+  bool fullscreen_state_changed = (state_ & GDK_WINDOW_STATE_FULLSCREEN) !=
+      (state & GDK_WINDOW_STATE_FULLSCREEN);
+
   state_ = state;
 
+  if (fullscreen_state_changed) {
+    if (state & GDK_WINDOW_STATE_FULLSCREEN) {
+      UpdateCustomFrame();
+      toolbar_->Hide();
+      tabstrip_->Hide();
+      bookmark_bar_->Hide(false);
+      extension_shelf_->Hide();
+    } else {
+      UpdateCustomFrame();
+      ShowSupportedWindowFeatures();
+    }
+  }
+
   UpdateWindowShape(bounds_.width(), bounds_.height());
   SaveWindowPosition();
 }
 
 bool BrowserWindowGtk::CanClose() const {
 #if defined(OS_CHROMEOS)
   if (drag_active_)
     return false;
 #endif
 
@@ skipping 225 matching lines @@
       SkColorGetG(frame_color), SkColorGetB(frame_color));
   gtk_widget_modify_bg(GTK_WIDGET(window_), GTK_STATE_NORMAL,
                        &frame_color_gdk);
 }
 
 void BrowserWindowGtk::OnSizeChanged(int width, int height) {
   UpdateWindowShape(width, height);
 }
 
 void BrowserWindowGtk::UpdateWindowShape(int width, int height) {
-  if (use_custom_frame_.GetValue() && !full_screen_ && !IsMaximized()) {
+  if (use_custom_frame_.GetValue() && !IsFullscreen() && !IsMaximized()) {
     // Make the top corners rounded.  We set a mask that includes most of the
     // window except for a few pixels in the top two corners.
     GdkRectangle top_rect = { 3, 0, width - 6, 1 };
     GdkRectangle mid_rect = { 1, 1, width - 2, 2 };
     GdkRectangle bot_rect = { 0, 3, width, height - 3 };
     GdkRegion* mask = gdk_region_rectangle(&top_rect);
     gdk_region_union_with_rect(mask, &mid_rect);
     gdk_region_union_with_rect(mask, &bot_rect);
     gdk_window_shape_combine_region(GTK_WIDGET(window_)->window, mask, 0, 0);
     gdk_region_destroy(mask);
@@ skipping 25 matching lines @@
     gtk_accel_group_connect(
         accel_group,
         kAcceleratorMap[i].keyval,
         kAcceleratorMap[i].modifier_type,
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAccelerator), this, NULL));
   }
 }
 
 void BrowserWindowGtk::UpdateCustomFrame() {
-  bool enable = use_custom_frame_.GetValue() && !full_screen_;
-  gtk_window_set_decorated(window_, !enable);
+  bool enable = use_custom_frame_.GetValue() && !IsFullscreen();
+  gtk_window_set_decorated(window_, !use_custom_frame_.GetValue());
   titlebar_->UpdateCustomFrame(enable);
   UpdateWindowShape(bounds_.width(), bounds_.height());
 }
 
 void BrowserWindowGtk::SaveWindowPosition() {
+  // Don't save the window position if it's in full screen mode because we
+  // don't want to restart the browser in full screen mode.
+  if (IsFullscreen())
+    return;
+
   // Browser::SaveWindowPlacement is used for session restore.
   if (browser_->ShouldSaveWindowPlacement())
     browser_->SaveWindowPlacement(bounds_, IsMaximized());
 
   // We also need to save the placement for startup.
   // This is a web of calls between views and delegates on Windows, but the
   // crux of the logic follows.  See also cocoa/browser_window_controller.mm.
   if (!g_browser_process->local_state())
     return;
 
@@ skipping 236 matching lines @@
       *edge = GDK_WINDOW_EDGE_NORTH_EAST;
     } else if (y < bounds_.height() - kResizeAreaCornerSize) {
       *edge = GDK_WINDOW_EDGE_EAST;
     } else {
       *edge = GDK_WINDOW_EDGE_SOUTH_EAST;
     }
     return true;
   }
   NOTREACHED();
 }