Fix issue 19785: Chrome enters full-screen mode when a maximized window is mo...

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 <string>
@@ skipping 469 matching lines @@
 #if defined(OS_CHROMEOS)
        drag_active_(false),
        panel_controller_(NULL),
        compact_navigation_bar_(NULL),
        status_area_(NULL),
 #endif
        frame_cursor_(NULL),
        is_active_(true),
        last_click_time_(0),
        maximize_after_show_(false),
-       accel_group_(NULL) {
+       accel_group_(NULL),
+       set_fullscreen_(false),
+       fullscreen_(false) {
   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);
   gtk_widget_add_events(GTK_WIDGET(window_), GDK_BUTTON_PRESS_MASK |
                                              GDK_POINTER_MOTION_MASK);
 
   // Add this window to its own unique window group to allow for
   // window-to-parent modality.
@@ skipping 385 matching lines @@
 
 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const {
   return restored_bounds_;
 }
 
 bool BrowserWindowGtk::IsMaximized() const {
   return (state_ & GDK_WINDOW_STATE_MAXIMIZED);
 }
 
 void BrowserWindowGtk::SetFullscreen(bool fullscreen) {
+  set_fullscreen_ = fullscreen;
   // 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_);
   } else {
     gtk_window_unfullscreen(window_);
   }
 }
 
 bool BrowserWindowGtk::IsFullscreen() const {
-  return (state_ & GDK_WINDOW_STATE_FULLSCREEN);
+  return fullscreen_;
 }
 
 LocationBar* BrowserWindowGtk::GetLocationBar() const {
   return toolbar_->GetLocationBar();
 }
 
 void BrowserWindowGtk::SetFocusToLocationBar() {
   if (!IsFullscreen())
     GetLocationBar()->FocusLocation();
 }
@@ skipping 294 matching lines @@
 
 void BrowserWindowGtk::UpdateUIForContents(TabContents* contents) {
   MaybeShowBookmarkBar(contents, false);
 }
 
 void BrowserWindowGtk::DestroyBrowser() {
   browser_.reset();
 }
 
 void BrowserWindowGtk::OnBoundsChanged(const gfx::Rect& bounds) {
+  if (bounds_ == bounds)
+    return;
+
   GetLocationBar()->location_entry()->ClosePopup();
 
   if (bounds_.size() != bounds.size())
     OnSizeChanged(bounds.width(), bounds.height());
 
   bounds_ = bounds;
   if (!IsFullscreen() && !IsMaximized())
     restored_bounds_ = bounds;
   SaveWindowPosition();
 }
 
 void BrowserWindowGtk::OnStateChanged(GdkWindowState state,
                                       GdkWindowState changed_mask) {
+  bool fullscreen_state = (state & GDK_WINDOW_STATE_FULLSCREEN);
+  bool fullscreen_state_changed = (changed_mask & GDK_WINDOW_STATE_FULLSCREEN);
+  bool is_fullscreen = set_fullscreen_ && fullscreen_state;
+
   state_ = state;
 
-  if (changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
-    bool is_fullscreen = state & GDK_WINDOW_STATE_FULLSCREEN;
+  // If Window Manager turns our window into fullscreen automatically
+  // without our request, then we need to turn it back, because we do not
+  // really want to be in fullscreen mode.
+  if (fullscreen_state_changed && fullscreen_state && !set_fullscreen_) {
+    gtk_window_unfullscreen(window_);
+    return;
+  }
+
+  if (fullscreen_ != is_fullscreen) {
+    fullscreen_ = is_fullscreen;
     browser_->UpdateCommandsForFullscreenMode(is_fullscreen);
     if (is_fullscreen) {
       UpdateCustomFrame();
       toolbar_->Hide();
       tabstrip_->Hide();
       bookmark_bar_->Hide(false);
       if (extension_shelf_.get())
         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
 
   // You cannot close a frame for which there is an active originating drag
   // session.
@@ skipping 773 matching lines @@
   // special-case the ones where the custom frame should be used.  These names
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }