diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 20:02:05 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 20:02:05 +0000 |
commit | dae12ee6df766d9cd3af83277f6e8d0f0e9bb20d (patch) | |
tree | 65f01afe493e3aec73488c4867c60f379b73270e /chrome/browser/views/tabs | |
parent | c91d9ced6258ada125bd9fb042ba795272a91fb6 (diff) | |
download | chromium_src-dae12ee6df766d9cd3af83277f6e8d0f0e9bb20d.zip chromium_src-dae12ee6df766d9cd3af83277f6e8d0f0e9bb20d.tar.gz chromium_src-dae12ee6df766d9cd3af83277f6e8d0f0e9bb20d.tar.bz2 |
Landing Thiago Farina's CL.
See http://codereview.chromium.org/159186
Renaming GetNormalBounds to GetRestoredBounds from browser_window.h.
BUG=None
TEST=None
TBR=tfarina
Review URL: http://codereview.chromium.org/160337
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tabs')
-rw-r--r-- | chrome/browser/views/tabs/tab_overview_drag_controller.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_overview_message_listener.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/views/tabs/tab_overview_drag_controller.cc b/chrome/browser/views/tabs/tab_overview_drag_controller.cc index 1fef35d6..df9b73b 100644 --- a/chrome/browser/views/tabs/tab_overview_drag_controller.cc +++ b/chrome/browser/views/tabs/tab_overview_drag_controller.cc @@ -77,7 +77,7 @@ bool TabOverviewDragController::Configure(const gfx::Point& location) { if (controller_->browser()) { browser_window_size_ = - controller_->browser()->window()->GetNormalBounds().size(); + controller_->browser()->window()->GetRestoredBounds().size(); } return true; @@ -115,7 +115,7 @@ void TabOverviewDragController::CommitDrag(const gfx::Point& location) { } else { DropTab(location); } - } else if (!dragging_ ) { + } else if (!dragging_) { // We haven't started dragging. Tell the controller to focus the browser. controller_->FocusBrowser(); } else { diff --git a/chrome/browser/views/tabs/tab_overview_message_listener.cc b/chrome/browser/views/tabs/tab_overview_message_listener.cc index d0b6665..e063f5c 100644 --- a/chrome/browser/views/tabs/tab_overview_message_listener.cc +++ b/chrome/browser/views/tabs/tab_overview_message_listener.cc @@ -91,7 +91,7 @@ void TabOverviewMessageListener::ProcessMessage( } else if (BrowserList::size() > 0) { Browser* browser = *BrowserList::begin(); controller_.reset(new TabOverviewController( - browser->window()->GetNormalBounds().origin())); + browser->window()->GetRestoredBounds().origin())); new_browser_window_.reset( new NewBrowserWindowWidget(browser->profile())); } @@ -136,7 +136,7 @@ void TabOverviewMessageListener::ShowOverview(Browser* browser, int horizontal_center) { if (!controller_.get()) { controller_.reset(new TabOverviewController( - browser->window()->GetNormalBounds().origin())); + browser->window()->GetRestoredBounds().origin())); } controller_->SetBrowser(browser, horizontal_center); controller_->Show(); |