The rectangle passed in to MoveContents is a content rectangle, not a window rectangle as I assumed.

BUG=1186573

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@411 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 36e0d2c..b9ebe51 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -794,14 +794,15 @@ void Browser::CloseContents(TabContents* source) {
   tabstrip_model_.CloseTabContentsAt(index);
 }
 
-void Browser::MoveContents(TabContents* source, const gfx::Rect& pos) {
+void Browser::MoveContents(TabContents* source, const gfx::Rect& content_pos) {
   if (GetType() != BrowserType::BROWSER) {
     NOTREACHED() << "moving invalid browser type";
     return;
   }
 
-  ::SetWindowPos(GetTopLevelHWND(), NULL, pos.x(), pos.y(), pos.width(),
-                 pos.height(), 0);
+  gfx::Rect window_pos = window_->GetBoundsForContentBounds(content_pos);
+  ::SetWindowPos(GetTopLevelHWND(), NULL, window_pos.x(), window_pos.y(), 
+                 window_pos.width(), window_pos.height(), 0);
   win_util::AdjustWindowToFit(GetTopLevelHWND());
 }
 
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index bc7be72..1cd1b57 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -317,7 +317,7 @@ class Browser : public TabStripModelDelegate,
   virtual void ActivateContents(TabContents* contents);
   virtual void LoadingStateChanged(TabContents* source);
   virtual void CloseContents(TabContents* source);
-  virtual void MoveContents(TabContents* source, const gfx::Rect& pos);
+  virtual void MoveContents(TabContents* source, const gfx::Rect& content_pos);
   virtual bool IsPopup(TabContents* source);
   virtual void URLStarredChanged(TabContents* source, bool starred);