Linux: correctly update window restore bounds.

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 1301 matching lines @@
 void BrowserWindowGtk::DestroyBrowser() {
   browser_.reset();
 }
 
 void BrowserWindowGtk::OnBoundsChanged(const gfx::Rect& bounds) {
   GetLocationBar()->location_entry()->ClosePopup();
 
   if (bounds_.size() != bounds.size())
     OnSizeChanged(bounds.width(), bounds.height());
 
+  // We update |bounds_| but not |restored_bounds_| here.  The latter needs
+  // to be updated conditionally when the window is non-maximized and non-
+  // fullscreen, but whether those state updates have been processed yet is
+  // window-manager specific.  We update |restored_bounds_| in the debounced
+  // handler below, after the window state has been updated.
   bounds_ = bounds;
-  if (!IsFullscreen() && !IsMaximized())
-    restored_bounds_ = bounds;
 
   // When a window is moved or resized, GTK will call MainWindowConfigured()
   // above.  The GdkEventConfigure* that it gets doesn't have quite the right
   // coordinates though (they're relative to the drawable window area, rather
   // than any window manager decorations, if enabled), so we need to call
   // gtk_window_get_position() to get the right values.  (Otherwise session
   // restore, if enabled, will restore windows to incorrect positions.)  That's
   // a round trip to the X server though, so we set a debounce timer and only
   // call it (in OnDebouncedBoundsChanged() below) after we haven't seen a
   // reconfigure event in a short while.
   // We don't use Reset() because the timer may not yet be running.
   // (In that case Stop() is a no-op.)
   window_configure_debounce_timer_.Stop();
   window_configure_debounce_timer_.Start(base::TimeDelta::FromMilliseconds(
       kDebounceTimeoutMilliseconds), this,
       &BrowserWindowGtk::OnDebouncedBoundsChanged);
 }
 
 void BrowserWindowGtk::OnDebouncedBoundsChanged() {
   gint x, y;
   gtk_window_get_position(window_, &x, &y);
   gfx::Point origin(x, y);
   bounds_.set_origin(origin);
   if (!IsFullscreen() && !IsMaximized())
-    restored_bounds_.set_origin(origin);
+    restored_bounds_ = bounds_;
   SaveWindowPosition();
 }
 
 void BrowserWindowGtk::OnStateChanged(GdkWindowState state,
                                       GdkWindowState changed_mask) {
   state_ = state;
 
   if (changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
     bool is_fullscreen = state & GDK_WINDOW_STATE_FULLSCREEN;
     browser_->UpdateCommandsForFullscreenMode(is_fullscreen);
@@ skipping 832 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");
 }