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

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

Issue 1392193004: Miscellaneous cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 5 years, 2 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
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 78cfc8f710115e89d64367390117565025524f3d..2fbf5ed41cd1eb1e1f0c290d468c9783c0c3b51c 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -371,7 +371,7 @@ void TabDragController::Drag(const gfx::Point& point_in_screen) {
// When all tabs in a maximized browser are dragged the browser gets
// restored during the drag and maximized back when the drag ends.
views::Widget* widget = GetAttachedBrowserWidget();
- const int last_tabstrip_width = attached_tabstrip_->tab_area_width();
+ const int last_tabstrip_width = attached_tabstrip_->GetTabAreaWidth();
std::vector<gfx::Rect> drag_bounds = CalculateBoundsForDraggedTabs();
OffsetX(GetAttachedDragPoint(point_in_screen).x(), &drag_bounds);
gfx::Rect new_bounds(CalculateDraggedBrowserBounds(source_tabstrip_,
@@ -1024,7 +1024,7 @@ void TabDragController::DetachIntoNewBrowserAndRunMoveLoop(
return;
}
- const int last_tabstrip_width = attached_tabstrip_->tab_area_width();
+ const int last_tabstrip_width = attached_tabstrip_->GetTabAreaWidth();
std::vector<gfx::Rect> drag_bounds = CalculateBoundsForDraggedTabs();
OffsetX(GetAttachedDragPoint(point_in_screen).x(), &drag_bounds);
@@ -1701,7 +1701,7 @@ void TabDragController::AdjustBrowserAndTabBoundsForDrag(
std::vector<gfx::Rect>* drag_bounds) {
attached_tabstrip_->InvalidateLayout();
attached_tabstrip_->DoLayout();
- const int dragged_tabstrip_width = attached_tabstrip_->tab_area_width();
+ const int dragged_tabstrip_width = attached_tabstrip_->GetTabAreaWidth();
// If the new tabstrip is smaller than the old resize the tabs.
if (dragged_tabstrip_width < last_tabstrip_width) {

Powered by Google App Engine
This is Rietveld 408576698