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

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

Issue 10382060: Unifies the two tab dragging variants. I would have liked to better (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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/tab_strip.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_strip.cc
===================================================================
--- chrome/browser/ui/views/tabs/tab_strip.cc (revision 135842)
+++ chrome/browser/ui/views/tabs/tab_strip.cc (working copy)
@@ -888,9 +888,10 @@
(event.type() == ui::ET_TOUCH_PRESSED ||
(event.type() == ui::ET_MOUSE_PRESSED &&
event.flags() & ui::EF_CONTROL_DOWN));
- drag_controller_.reset(TabDragController::Create(
+ drag_controller_.reset(new TabDragController);
+ drag_controller_->Init(
this, tab, tabs, gfx::Point(x, y), tab->GetMirroredXInView(event.x()),
- selection_model, move_only));
+ selection_model, move_only);
}
void TabStrip::ContinueDrag(const views::MouseEvent& event) {
@@ -901,7 +902,7 @@
bool TabStrip::EndDrag(bool canceled) {
if (!drag_controller_.get())
return false;
- bool started_drag = drag_controller_->GetStartedDrag();
+ bool started_drag = drag_controller_->started_drag();
drag_controller_->EndDrag(canceled);
return started_drag;
}
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698