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

4 files changed, 6 insertions, 27 deletions

diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h
index b0ace80..dde965e 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/cocoa/browser_window_cocoa.h
@@ -30,7 +30,7 @@ class BrowserWindowCocoa : 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;
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 01d592e..4972eae 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -64,27 +64,13 @@ void BrowserWindowCocoa::Show() {
   [window() makeKeyAndOrderFront:controller_];
 }
 
-void BrowserWindowCocoa::SetBounds(const gfx::Rect& bounds,
-                                   BoundsType bounds_type) {
-  gfx::Rect win_bounds = bounds;
-  if (bounds_type == BrowserWindow::CONTENT_BOUNDS) {
-    // Fetch the size of the content area in the NSWindow.
-    NSSize content_area_size = [controller_ tabContentsFrame].size;
-    int width_offset = bounds.width() - content_area_size.width;
-    int height_offset = bounds.height() - content_area_size.height;
-
-    // Adjust the size relative to the current frame size.
-    NSSize current_frame = [window() frame].size;
-    win_bounds.set_width(current_frame.width + width_offset);
-    win_bounds.set_height(current_frame.height + height_offset);
-  }
-
-  NSRect cocoa_bounds = NSMakeRect(win_bounds.x(), 0, win_bounds.width(),
-                                   win_bounds.height());
+void BrowserWindowCocoa::SetBounds(const gfx::Rect& bounds) {
+  NSRect cocoa_bounds = NSMakeRect(bounds.x(), 0, bounds.width(),
+                                   bounds.height());
   // Flip coordinates based on the primary screen.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   cocoa_bounds.origin.y =
-      [screen frame].size.height - win_bounds.height() - win_bounds.y();
+      [screen frame].size.height - bounds.height() - bounds.y();
 
   [window() setFrame:cocoa_bounds display:YES];
 }
diff --git a/chrome/browser/cocoa/browser_window_controller.h b/chrome/browser/cocoa/browser_window_controller.h
index bbab2ee..817d536 100644
--- a/chrome/browser/cocoa/browser_window_controller.h
+++ b/chrome/browser/cocoa/browser_window_controller.h
@@ -163,9 +163,6 @@ class TabStripModelObserverBridge;
 // Sets whether or not the current page in the frontmost tab is bookmarked.
 - (void)setStarredState:(BOOL)isStarred;
 
-// Returns the current frame of the the content area.
-- (NSRect)tabContentsFrame;
-
 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
 // in the coordinate system of the content area of the currently selected tab.
 - (NSRect)selectedTabGrowBoxRect;
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 6986885..2be2960 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -220,7 +220,7 @@
       windowRect.set_origin(WindowSizer::GetDefaultPopupOrigin(size));
     }
 
-    windowShim_->SetBounds(windowRect, BrowserWindow::WINDOW_BOUNDS);
+    windowShim_->SetBounds(windowRect);
 
     // Puts the incognito badge on the window frame, if necessary.
     [self installIncognitoBadge];
@@ -987,10 +987,6 @@
   [toolbarController_ setStarredState:isStarred];
 }
 
-- (NSRect)tabContentsFrame {
-  return [[self tabContentArea] frame];
-}
-
 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
 // in the coordinate system of the content area of the currently selected tab.
 // |windowGrowBox| needs to be in the window's coordinate system.