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

Unified Diff: ash/wm/system_gesture_event_filter.cc

Issue 10446010: wip: Add ui::EventType parameter. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wip - views_unittests Created 8 years, 7 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/focus_cycler.cc ('k') | chrome/browser/chromeos/input_method/input_method_manager_impl_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 35828949265b91ce5b63d476eafe0996ef24313c..f26fced6368c4bf8b269c44a2357d854b7a2b37f 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -137,8 +137,9 @@ bool SystemGestureEventFilter::HandleLauncherControl(
ash::Shell::GetInstance()->accelerator_controller();
if (start_location_ == BEZEL_START_BOTTOM && event->delta_y() < 0)
// We leave the work to switch to the next window to our accelerators.
- accelerator->AcceleratorPressed(
- ui::Accelerator(ui::VKEY_LWIN, ui::EF_CONTROL_DOWN));
+ accelerator->AcceleratorPressed(ui::Accelerator(ui::VKEY_LWIN,
+ ui::EF_CONTROL_DOWN,
+ ui::ET_KEY_PRESSED));
else
return false;
// No further notifications for this gesture.
@@ -152,11 +153,11 @@ bool SystemGestureEventFilter::HandleApplicationControl(
if (start_location_ == BEZEL_START_LEFT && event->delta_x() > 0)
// We leave the work to switch to the next window to our accelerators.
accelerator->AcceleratorPressed(
- ui::Accelerator(ui::VKEY_F5, ui::EF_SHIFT_DOWN));
+ ui::Accelerator(ui::VKEY_F5, ui::EF_SHIFT_DOWN, ui::ET_KEY_PRESSED));
else if (start_location_ == BEZEL_START_RIGHT && event->delta_x() < 0)
// We leave the work to switch to the previous window to our accelerators.
accelerator->AcceleratorPressed(
- ui::Accelerator(ui::VKEY_F5, ui::EF_NONE));
+ ui::Accelerator(ui::VKEY_F5, ui::EF_NONE, ui::ET_KEY_PRESSED));
else
return false;
// No further notifications for this gesture.
« no previous file with comments | « ash/focus_cycler.cc ('k') | chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698