diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 17:47:43 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 17:47:43 +0000 |
| commit | 68c477df6917633a7a9c64f8624446ca0bd895d5 (patch) | |
| tree | a270354aa75de9516ba5b150568bb1d142b24b1c /chrome/browser/ui/views/tabs/dragged_tab_controller.cc | |
| parent | 8a9c6c3401524c0a4b5d37d65335e9124885305a (diff) | |
| download | chromium_src-68c477df6917633a7a9c64f8624446ca0bd895d5.zip chromium_src-68c477df6917633a7a9c64f8624446ca0bd895d5.tar.gz chromium_src-68c477df6917633a7a9c64f8624446ca0bd895d5.tar.bz2 | |
Move more from Window onto Widget.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7054052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/tabs/dragged_tab_controller.cc')
| -rw-r--r-- | chrome/browser/ui/views/tabs/dragged_tab_controller.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 88c5086..e42f8e8 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -926,7 +926,7 @@ void DraggedTabController::Attach(BaseTabStrip* attached_tabstrip, } // Move the corresponding window to the front. - attached_tabstrip_->GetWindow()->Activate(); + attached_tabstrip_->GetWidget()->Activate(); } void DraggedTabController::Detach() { @@ -1275,8 +1275,8 @@ void DraggedTabController::CompleteDrag() { } } // Compel the model to construct a new window for the detached TabContents. - views::Window* window = source_tabstrip_->GetWindow(); - gfx::Rect window_bounds(window->GetNormalBounds()); + views::Widget* widget = source_tabstrip_->GetWidget(); + gfx::Rect window_bounds(widget->GetRestoredBounds()); window_bounds.set_origin(GetWindowCreatePoint()); // When modifying the following if statement, please make sure not to // introduce issue listed in http://crbug.com/6223 comment #11. @@ -1290,7 +1290,7 @@ void DraggedTabController::CompleteDrag() { Browser* new_browser = GetModel(source_tabstrip_)->delegate()->CreateNewStripWithContents( drag_data_[0].contents, window_bounds, dock_info_, - window->IsMaximized()); + widget->IsMaximized()); TabStripModel* new_model = new_browser->tabstrip_model(); new_model->SetTabPinned( new_model->GetIndexOfTabContents(drag_data_[0].contents), |