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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/ash/tab_scrubber.cc

Issue 613373004: Adopt ui::GestureConfiguration on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move all the methods to superclass 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 | « chrome/browser/ui/gesture_prefs_observer_factory_aura.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | content/browser/renderer_host/input/input_router_config_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/tab_scrubber.cc
diff --git a/chrome/browser/ui/views/ash/tab_scrubber.cc b/chrome/browser/ui/views/ash/tab_scrubber.cc
index cfff2b8b990288ef111fd047c1f60047be88c4fd..9f9c4145799b15aa5231be49a2ac6969514067a0 100644
--- a/chrome/browser/ui/views/ash/tab_scrubber.cc
+++ b/chrome/browser/ui/views/ash/tab_scrubber.cc
@@ -20,7 +20,7 @@
#include "ui/aura/window.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
#include "ui/views/controls/glow_hover_controller.h"
namespace {
@@ -168,9 +168,10 @@ void TabScrubber::OnScrollEvent(ui::ScrollEvent* event) {
if (activate_timer_.IsRunning()) {
activate_timer_.Reset();
} else {
- int delay = use_default_activation_delay_ ?
- ui::GestureConfiguration::tab_scrub_activation_delay_in_ms() :
- activation_delay_;
+ int delay = use_default_activation_delay_
+ ? ui::GestureConfiguration::GetInstance()
+ ->tab_scrub_activation_delay_in_ms()
+ : activation_delay_;
if (delay >= 0) {
activate_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(delay),
« no previous file with comments | « chrome/browser/ui/gesture_prefs_observer_factory_aura.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | content/browser/renderer_host/input/input_router_config_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698