| 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;
|
| }
|
|
|