summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame/browser_view.cc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 17:57:12 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 17:57:12 +0000
commite561e20e4220751a8eb243ea5da7eb154180c6da (patch)
tree21cb95f4ed21f8f753b3768af2920b1f96b01418 /chrome/browser/views/frame/browser_view.cc
parent4def84918982a6c01649b5e4eadfac4904c1c847 (diff)
downloadchromium_src-e561e20e4220751a8eb243ea5da7eb154180c6da.zip
chromium_src-e561e20e4220751a8eb243ea5da7eb154180c6da.tar.gz
chromium_src-e561e20e4220751a8eb243ea5da7eb154180c6da.tar.bz2
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
Diffstat (limited to 'chrome/browser/views/frame/browser_view.cc')
-rw-r--r--chrome/browser/views/frame/browser_view.cc17
1 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 302e13f..9d62c70 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -682,21 +682,8 @@ void BrowserView::Show() {
frame_->GetWindow()->Show();
}
-void BrowserView::SetBounds(const gfx::Rect& bounds, BoundsType bounds_type) {
- gfx::Rect new_bounds = bounds;
- if (bounds_type == CONTENT_BOUNDS) {
- // Caluclate how much larger the window needs to be to accomidate |bounds|.
- gfx::Rect container_bounds = contents_container_->bounds();
- int width_offset = bounds.width() - container_bounds.width();
- int height_offset = bounds.height() - container_bounds.height();
-
- gfx::Rect win_bounds;
- GetWidget()->GetBounds(&win_bounds, true);
- new_bounds.set_width(win_bounds.width() + width_offset);
- new_bounds.set_height(win_bounds.height() + height_offset);
- }
-
- GetWidget()->SetBounds(new_bounds);
+void BrowserView::SetBounds(const gfx::Rect& bounds) {
+ GetWidget()->SetBounds(bounds);
}
void BrowserView::Close() {