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

Unified Diff: ash/wm/system_gesture_event_filter.cc

Issue 10824247: Remove GestureEvent interface, and rename GestureEventImpl to GestureEvent. (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/wm/system_gesture_event_filter.h ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter.cc
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index e909acb0022787fdb000e3725c64584a18eeddab..3d79937af0017d2f7ade649a82284023ed5e6a1b 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -374,7 +374,7 @@ class SystemPinchHandler {
~SystemPinchHandler() {
}
- SystemGestureStatus ProcessGestureEvent(const ui::GestureEventImpl& event) {
+ SystemGestureStatus ProcessGestureEvent(const ui::GestureEvent& event) {
// The target has changed, somehow. Let's bale.
if (!widget_ || !widget_->widget_delegate()->CanResize())
return SYSTEM_GESTURE_END;
@@ -551,7 +551,7 @@ ui::TouchStatus SystemGestureEventFilter::PreHandleTouchEvent(
}
ui::GestureStatus SystemGestureEventFilter::PreHandleGestureEvent(
- aura::Window* target, ui::GestureEventImpl* event) {
+ aura::Window* target, ui::GestureEvent* event) {
touch_uma_.RecordGestureEvent(target, *event);
long_press_affordance_->ProcessEvent(target, event);
if (!target || target == target->GetRootWindow()) {
@@ -677,7 +677,7 @@ void SystemGestureEventFilter::ClearGestureHandlerForWindow(
bool SystemGestureEventFilter::HandleDeviceControl(
aura::Window* target,
- ui::GestureEventImpl* event) {
+ ui::GestureEvent* event) {
gfx::Rect screen = gfx::Screen::GetDisplayNearestWindow(target).bounds();
double percent = 100.0 * (event->y() - screen.y()) / screen.height();
if (percent > 100.0)
@@ -704,7 +704,7 @@ bool SystemGestureEventFilter::HandleDeviceControl(
}
bool SystemGestureEventFilter::HandleLauncherControl(
- ui::GestureEventImpl* event) {
+ ui::GestureEvent* event) {
if (start_location_ == BEZEL_START_BOTTOM &&
event->details().scroll_y() < 0) {
ash::AcceleratorController* accelerator =
@@ -717,7 +717,7 @@ bool SystemGestureEventFilter::HandleLauncherControl(
}
bool SystemGestureEventFilter::HandleApplicationControl(
- ui::GestureEventImpl* event) {
+ ui::GestureEvent* event) {
ash::AcceleratorController* accelerator =
ash::Shell::GetInstance()->accelerator_controller();
if (start_location_ == BEZEL_START_LEFT && event->details().scroll_x() > 0)
« no previous file with comments | « ash/wm/system_gesture_event_filter.h ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698