diff options
| author | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 12:07:35 +0000 |
|---|---|---|
| committer | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 12:07:35 +0000 |
| commit | 0c7f7ea1a698bde4670c8f93adaab34f1befd1a9 (patch) | |
| tree | bc3c3c9659da957bff0daac2f193d5b88e1bee77 /ash/wm | |
| parent | ddb5e56ff2f76f2734187d9477f0732f68dff396 (diff) | |
| download | chromium_src-0c7f7ea1a698bde4670c8f93adaab34f1befd1a9.zip chromium_src-0c7f7ea1a698bde4670c8f93adaab34f1befd1a9.tar.gz chromium_src-0c7f7ea1a698bde4670c8f93adaab34f1befd1a9.tar.bz2 | |
Replace ET_GESTURE_DOUBLE_TAP with ET_GESTURE_TAP
ET_GESTURE_TAP now has a tap count memeber to tell if it
is a single or double tap. So replace the usage of
ET_GESTURE_DOUBLE_TAP with ET_GESTURE_TAP.
BUG=140382
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=188901
Review URL: https://chromiumcodereview.appspot.com/12745006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/system_gesture_event_filter_unittest.cc | 4 | ||||
| -rw-r--r-- | ash/wm/workspace/workspace_event_handler.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 391cfbf..17ea958 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -253,7 +253,7 @@ TEST_F(SystemGestureEventFilterTest, TapOutsideRootWindow) { root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&press); scoped_ptr<ui::GestureEvent> event(CreateGesture( - ui::ET_GESTURE_TAP, 0, 0, 0, 0, kTouchId)); + ui::ET_GESTURE_TAP, 0, 0, 1, 0, kTouchId)); bool consumed = root_window->DispatchGestureEvent(event.get()); EXPECT_TRUE(consumed); @@ -264,7 +264,7 @@ TEST_F(SystemGestureEventFilterTest, TapOutsideRootWindow) { shell_test.system_gesture_event_filter()); scoped_ptr<ui::GestureEvent> event2(CreateGesture( - ui::ET_GESTURE_TAP, 0, 0, 0, 0, kTouchId)); + ui::ET_GESTURE_TAP, 0, 0, 1, 0, kTouchId)); consumed = root_window->DispatchGestureEvent(event2.get()); // The event filter doesn't exist, so the touch won't be consumed. diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc index 9ff19d2..5839e21 100644 --- a/ash/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc @@ -113,7 +113,8 @@ void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) { void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) { aura::Window* target = static_cast<aura::Window*>(event->target()); - if (event->type() == ui::ET_GESTURE_DOUBLE_TAP && + if (event->type() == ui::ET_GESTURE_TAP && + event->details().tap_count() == 2 && target->delegate()->GetNonClientComponent(event->location()) == HTCAPTION) { ash::Shell::GetInstance()->delegate()->RecordUserMetricsAction( |