Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: chrome/browser/ui/views/tabs/dragged_tab_controller.cc

Issue 7054052: Move more from Window onto Widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab_strip.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/dragged_tab_controller.cc
===================================================================
--- chrome/browser/ui/views/tabs/dragged_tab_controller.cc (revision 88218)
+++ chrome/browser/ui/views/tabs/dragged_tab_controller.cc (working copy)
@@ -926,7 +926,7 @@
}
// Move the corresponding window to the front.
- attached_tabstrip_->GetWindow()->Activate();
+ attached_tabstrip_->GetWidget()->Activate();
}
void DraggedTabController::Detach() {
@@ -1275,8 +1275,8 @@
}
}
// 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 @@
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),
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab_strip.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698