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

Unified Diff: ash/launcher/launcher_view.cc

Issue 10828265: Replace views::LocatedEvent with ui::LocatedEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « ash/launcher/launcher_view.h ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view.cc
===================================================================
--- ash/launcher/launcher_view.cc (revision 151267)
+++ ash/launcher/launcher_view.cc (working copy)
@@ -571,7 +571,7 @@
}
void LauncherView::PrepareForDrag(Pointer pointer,
- const views::LocatedEvent& event) {
+ const ui::LocatedEvent& event) {
DCHECK(!dragging());
DCHECK(drag_view_);
drag_pointer_ = pointer;
@@ -589,10 +589,10 @@
bounds_animator_->StopAnimatingView(drag_view_);
}
-void LauncherView::ContinueDrag(const views::LocatedEvent& event) {
+void LauncherView::ContinueDrag(const ui::LocatedEvent& event) {
// TODO: I don't think this works correctly with RTL.
gfx::Point drag_point(event.location());
- views::View::ConvertPointToView(drag_view_, this, &drag_point);
+ views::View::ConvertPointToTarget(drag_view_, this, &drag_point);
int current_index = view_model_->GetIndexOfView(drag_view_);
DCHECK_NE(-1, current_index);
@@ -889,7 +889,7 @@
void LauncherView::PointerPressedOnButton(views::View* view,
Pointer pointer,
- const views::LocatedEvent& event) {
+ const ui::LocatedEvent& event) {
if (drag_view_)
return;
@@ -906,7 +906,7 @@
void LauncherView::PointerDraggedOnButton(views::View* view,
Pointer pointer,
- const views::LocatedEvent& event) {
+ const ui::LocatedEvent& event) {
if (!dragging() && drag_view_ &&
primary_axis_coordinate(abs(event.x() - drag_offset_),
abs(event.y() - drag_offset_)) >=
« no previous file with comments | « ash/launcher/launcher_view.h ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698