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

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

Issue 10479010: Gesture related changes for views: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test and add some mores Created 8 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 | « no previous file | ui/views/view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ac75312873b8efa517a2306df096a4393199c216..c3e7ea9558ced84a46cb1bfb028402d202e0e9ff 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -778,7 +778,7 @@ TabDragController::DragBrowserToNewTabStrip(
target_tabstrip->OwnDragController(this);
// Disable animations so that we don't see a close animation on aero.
browser_widget->SetVisibilityChangedAnimationsEnabled(false);
- browser_widget->ReleaseMouseCapture();
+ browser_widget->ReleaseCapture();
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this.
browser_widget->Hide();
@@ -1118,7 +1118,7 @@ void TabDragController::Attach(TabStrip* attached_tabstrip,
// window has mouse capture. This is important so that if activation changes
// the drag isn't prematurely canceled.
if (detach_into_browser_) {
- attached_tabstrip_->GetWidget()->SetMouseCapture(attached_tabstrip_);
+ attached_tabstrip_->GetWidget()->SetCapture(attached_tabstrip_);
attached_tabstrip_->OwnDragController(this);
}
@@ -1136,7 +1136,7 @@ void TabDragController::Detach() {
// reattach ownership is transfered.
if (detach_into_browser_) {
attached_tabstrip_->ReleaseDragController();
- attached_tabstrip_->GetWidget()->ReleaseMouseCapture();
+ attached_tabstrip_->GetWidget()->ReleaseCapture();
}
mouse_move_direction_ = kMovedMouseLeft | kMovedMouseRight;
@@ -1253,7 +1253,7 @@ void TabDragController::RunMoveLoop() {
// destroying the drag loop. Release mouse capture ourself before this while
// the DragController isn't owned by the TabStrip.
attached_tabstrip_->ReleaseDragController();
- attached_tabstrip_->GetWidget()->ReleaseMouseCapture();
+ attached_tabstrip_->GetWidget()->ReleaseCapture();
attached_tabstrip_->OwnDragController(this);
views::Widget::MoveLoopResult result = move_loop_widget_->RunMoveLoop();
content::NotificationService::current()->Notify(
@@ -1284,7 +1284,7 @@ void TabDragController::RunMoveLoop() {
tab_strip_to_attach_to_after_exit_ = NULL;
}
DCHECK(attached_tabstrip_);
- attached_tabstrip_->GetWidget()->SetMouseCapture(attached_tabstrip_);
+ attached_tabstrip_->GetWidget()->SetCapture(attached_tabstrip_);
} else if (active_) {
EndDrag(result == views::Widget::MOVE_LOOP_CANCELED);
}
« no previous file with comments | « no previous file | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698