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

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: 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
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 0d6a8157b0d03043f7bfba46c83448feec626c38..e02118bb9f6f08544ff9922120574803658054ae 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,8 +254,9 @@ void LongPressAffordanceHandler::ProcessEvent(aura::Window* target,
tap_down_location_ = event->root_location();
SetTapDownTarget(target);
current_animation_type_ = GROW_ANIMATION;
- int64 timer_start_time_ms =
- ui::GestureConfiguration::semi_long_press_time_in_seconds() * 1000;
+ int64 timer_start_time_ms = ui::GestureConfiguration::GetInstance()
+ ->semi_long_press_time_in_seconds() *
+ 1000;
timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(timer_start_time_ms),
this,
@@ -287,8 +288,10 @@ void LongPressAffordanceHandler::StartAnimation() {
}
view_.reset(new LongPressAffordanceView(tap_down_location_, root_window));
SetDuration(
- ui::GestureConfiguration::long_press_time_in_seconds() * 1000 -
- ui::GestureConfiguration::semi_long_press_time_in_seconds() * 1000 -
+ ui::GestureConfiguration::GetInstance()->long_press_timeout_in_ms() -
+ ui::GestureConfiguration::GetInstance()
+ ->semi_long_press_time_in_seconds() *
+ 1000 -
kAffordanceDelayBeforeShrinkMs);
Start();
break;

Powered by Google App Engine
This is Rietveld 408576698