diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 17:57:12 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 17:57:12 +0000 |
| commit | e561e20e4220751a8eb243ea5da7eb154180c6da (patch) | |
| tree | 21cb95f4ed21f8f753b3768af2920b1f96b01418 /chrome/browser/browser.cc | |
| parent | 4def84918982a6c01649b5e4eadfac4904c1c847 (diff) | |
| download | chromium_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/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 4e37d4c..7c71b72 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1934,8 +1934,7 @@ void Browser::DuplicateContentsAt(int index) { // been given an offset by the OS, so we shouldn't copy the old bounds. BrowserWindow* new_window = browser->window(); new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(), - window()->GetRestoredBounds().size()), - BrowserWindow::WINDOW_BOUNDS); + window()->GetRestoredBounds().size())); // We need to show the browser now. Otherwise ContainerWin assumes the // TabContents is invisible and won't size it. @@ -2276,8 +2275,7 @@ void Browser::MoveContents(TabContents* source, const gfx::Rect& pos) { NOTREACHED() << "moving invalid browser type"; return; } - - window_->SetBounds(pos, BrowserWindow::CONTENT_BOUNDS); + window_->SetBounds(pos); } void Browser::DetachContents(TabContents* source) { |