From e561e20e4220751a8eb243ea5da7eb154180c6da Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Wed, 24 Mar 2010 17:57:12 +0000 Subject: Revert "Fix browser side handling of moveTo by resizing the content area; not the window." This reverts commit 2ce3ea80b627f58acb97802b0cc182b3a2bdf809 (r40386). This seems to tickle some weird race condition where the renderer and the browser process disagree about the size of the window. I'm reverting this change as 38685 is scarier then 27365. TEST=none BUG=38785,27365 Review URL: http://codereview.chromium.org/1259004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42494 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gtk/browser_window_gtk.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'chrome/browser/gtk/browser_window_gtk.h') diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h index f24e094..cbc9270 100644 --- a/chrome/browser/gtk/browser_window_gtk.h +++ b/chrome/browser/gtk/browser_window_gtk.h @@ -48,7 +48,7 @@ class BrowserWindowGtk : public BrowserWindow, // Overridden from BrowserWindow virtual void Show(); - virtual void SetBounds(const gfx::Rect& bounds, BoundsType bounds_type); + virtual void SetBounds(const gfx::Rect& bounds); virtual void Close(); virtual void Activate(); virtual bool IsActive() const; @@ -248,6 +248,11 @@ class BrowserWindowGtk : public BrowserWindow, // Save the window position in the prefs. void SaveWindowPosition(); + // Set the bounds of the current window. If |exterior| is true, set the size + // of the window itself, otherwise set the bounds of the web contents. In + // either case, set the position of the window. + void SetBoundsImpl(const gfx::Rect& bounds, bool exterior); + // Callback for when the custom frame alignment needs to be redrawn. // The content area includes the toolbar and web page but not the tab strip. static gboolean OnCustomFrameExpose(GtkWidget* widget, GdkEventExpose* event, -- cgit v1.1