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

Unified Diff: ash/magnifier/magnification_controller.cc

Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge-tot 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_tooltip_manager_unittest.cc ('k') | ash/system/tray/tray_bubble_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller.cc
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index 22785d352137c178598050b8f5ccd024e81c6b56..4a84ef467d07e0a1069cfdb9b91c7db6513f8c65 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -104,7 +104,7 @@ class MagnificationControllerImpl : virtual public MagnificationController,
ui::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(
aura::Window* target,
- ui::TouchEventImpl* event) OVERRIDE;
+ ui::TouchEvent* event) OVERRIDE;
virtual ui::GestureStatus PreHandleGestureEvent(
aura::Window* target,
ui::GestureEventImpl* event) OVERRIDE;
@@ -448,7 +448,7 @@ bool MagnificationControllerImpl::PreHandleMouseEvent(aura::Window* target,
ui::TouchStatus MagnificationControllerImpl::PreHandleTouchEvent(
aura::Window* target,
- ui::TouchEventImpl* event) {
+ ui::TouchEvent* event) {
return ui::TOUCH_STATUS_UNKNOWN;
}
« no previous file with comments | « ash/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/system/tray/tray_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698