Linux: make BrowserWindowGtk's window reconfigure timer more transparent to tests.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <dlfcn.h>
 #include <string>
@@ skipping 1454 matching lines @@
   browser_.reset();
 }
 
 gboolean BrowserWindowGtk::OnConfigure(GtkWidget* widget,
                                        GdkEventConfigure* event) {
   gfx::Rect bounds(event->x, event->y, event->width, event->height);
 
   // When the window moves, we'll get multiple configure-event signals. We can
   // also get events when the bounds haven't changed, but the window's stacking
   // has, which we aren't interested in. http://crbug.com/70125
-  if (bounds == bounds_)
+  if (bounds == configure_bounds_)
     return FALSE;
 
   GetLocationBar()->location_entry()->ClosePopup();
 
   TabContentsWrapper* tab = GetDisplayedTab();
   if (tab) {
     tab->web_contents()->GetRenderViewHost()->NotifyMoveOrResizeStarted();
   }
 
   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;
+  configure_bounds_ = bounds;
 
   // The GdkEventConfigure* we get here 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.
@@ skipping 237 matching lines @@
   g_signal_connect(window_, "button-press-event",
                    G_CALLBACK(OnButtonPressEventThunk), this);
   g_signal_connect(window_, "focus-in-event",
                    G_CALLBACK(OnFocusInThunk), this);
   g_signal_connect(window_, "focus-out-event",
                    G_CALLBACK(OnFocusOutThunk), this);
 }
 
 void BrowserWindowGtk::InitWidgets() {
   ConnectHandlersToSignals();
-  bounds_ = restored_bounds_ = GetInitialWindowBounds(window_);
+
+  bounds_ = configure_bounds_ = restored_bounds_ =
+      GetInitialWindowBounds(window_);
 
   // This vbox encompasses all of the widgets within the browser.  This is
   // everything except the custom frame border.
   window_vbox_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_show(window_vbox_);
 
   // We hold an always hidden GtkMenuBar inside our browser window simply to
   // fool the Unity desktop, which will mirror the contents of the first
   // GtkMenuBar it sees into the global menu bar. (It doesn't seem to check the
   // visibility of the GtkMenuBar, so we can just permanently hide it.)
@@ skipping 758 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }