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

Unified Diff: ash/wm/gestures/long_press_affordance_handler.cc

Issue 613373004: Adopt ui::GestureConfiguration on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Copyright Created 6 years, 2 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/test/ash_test_base.cc ('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/gestures/long_press_affordance_handler.cc
diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc
index 49d3bd867df1494084532ae678190551b41fcd5a..b1fc87916520f195af8dc97534733463d510cdf3 100644
--- a/ash/wm/gestures/long_press_affordance_handler.cc
+++ b/ash/wm/gestures/long_press_affordance_handler.cc
@@ -17,7 +17,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/compositor/layer.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/transform.h"
@@ -254,12 +254,12 @@ void LongPressAffordanceHandler::ProcessEvent(aura::Window* target,
tap_down_location_ = event->root_location();
SetTapDownTarget(target);
current_animation_type_ = GROW_ANIMATION;
- timer_.Start(
- FROM_HERE,
- base::TimeDelta::FromMilliseconds(
- ui::GestureConfiguration::semi_long_press_time_in_ms()),
- this,
- &LongPressAffordanceHandler::StartAnimation);
+ timer_.Start(FROM_HERE,
+ base::TimeDelta::FromMilliseconds(
+ ui::GestureConfiguration::GetInstance()
+ ->semi_long_press_time_in_ms()),
+ this,
+ &LongPressAffordanceHandler::StartAnimation);
break;
}
case ui::ET_GESTURE_TAP:
@@ -286,8 +286,10 @@ void LongPressAffordanceHandler::StartAnimation() {
return;
}
view_.reset(new LongPressAffordanceView(tap_down_location_, root_window));
- SetDuration(ui::GestureConfiguration::long_press_time_in_ms() -
- ui::GestureConfiguration::semi_long_press_time_in_ms() -
+ SetDuration(
+ ui::GestureConfiguration::GetInstance()->long_press_time_in_ms() -
+ ui::GestureConfiguration::GetInstance()
+ ->semi_long_press_time_in_ms() -
kAffordanceDelayBeforeShrinkMs);
Start();
break;
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698