ash/wm/gestures/long_press_affordance_handler.cc - Issue 630003003: Change GestureConfiguration types to be consistent with each other and with the

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 630003003: Change GestureConfiguration types to be consistent with each other and with the (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

« no previous file with comments | « ash/frame/caption_buttons/frame_size_button_unittest.cc ('k') | chrome/browser/resources/gesture_config.js » ('j') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 0d6a8157b0d03043f7bfba46c83448feec626c38..49d3bd867df1494084532ae678190551b41fcd5a 100644

--- a/ash/wm/gestures/long_press_affordance_handler.cc

+++ b/ash/wm/gestures/long_press_affordance_handler.cc

@@ -254,12 +254,12 @@ 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;

- timer_.Start(FROM_HERE,

- base::TimeDelta::FromMilliseconds(timer_start_time_ms),

- this,

- &LongPressAffordanceHandler::StartAnimation);

+ timer_.Start(

+ FROM_HERE,

+ base::TimeDelta::FromMilliseconds(

+ ui::GestureConfiguration::semi_long_press_time_in_ms()),

+ this,

+ &LongPressAffordanceHandler::StartAnimation);

break;

}

case ui::ET_GESTURE_TAP:

@@ -286,9 +286,8 @@ void LongPressAffordanceHandler::StartAnimation() {

return;

}

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 -

+ SetDuration(ui::GestureConfiguration::long_press_time_in_ms() -

+ ui::GestureConfiguration::semi_long_press_time_in_ms() -

kAffordanceDelayBeforeShrinkMs);

Start();

break;