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

Unified Diff: ash/drag_drop/drag_drop_controller_unittest.cc

Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE… (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 | « no previous file | ash/launcher/launcher_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_controller_unittest.cc
===================================================================
--- ash/drag_drop/drag_drop_controller_unittest.cc (revision 151481)
+++ ash/drag_drop/drag_drop_controller_unittest.cc (working copy)
@@ -15,7 +15,6 @@
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/event.h"
-#include "ui/views/events/event.h"
#include "ui/views/test/test_views_delegate.h"
#include "ui/views/view.h"
#include "ui/views/views_delegate.h"
@@ -81,11 +80,11 @@
return true;
}
- void OnDragEntered(const views::DropTargetEvent& event) OVERRIDE {
+ void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE {
num_drag_enters_++;
}
- int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE {
+ int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE {
num_drag_updates_++;
return ui::DragDropTypes::DRAG_COPY;
}
@@ -94,7 +93,7 @@
num_drag_exits_++;
}
- int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE {
+ int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE {
num_drops_++;
return ui::DragDropTypes::DRAG_COPY;
}
« no previous file with comments | « no previous file | ash/launcher/launcher_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698