Adopt ui::GestureConfiguration on Android

chrome/browser/ui/views/ash/tab_scrubber.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #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 {
 const int64 kActivationDelayMS = 200;
 }
 
 // static
 TabScrubber* TabScrubber::GetInstance() {
   static TabScrubber* instance = NULL;
   if (!instance)
@@ skipping 127 matching lines @@
 
   int new_index = tab_strip->GetModelIndexOfTab(new_tab);
   if (highlighted_tab_ == -1 &&
       new_index == browser->tab_strip_model()->active_index())
     return;
 
   if (new_index != highlighted_tab_) {
     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),
                               base::Bind(&TabScrubber::FinishScrub,
                                          weak_ptr_factory_.GetWeakPtr(),
                                          true));
       }
     }
     if (highlighted_tab_ != -1) {
       Tab* tab = tab_strip->tab_at(highlighted_tab_);
@@ skipping 93 matching lines @@
       UMA_HISTOGRAM_CUSTOM_COUNTS("Tabs.ScrubDistance", distance, 0, 20, 21);
       browser_->tab_strip_model()->ActivateTabAt(highlighted_tab_, true);
     }
     tab_strip->RemoveObserver(this);
   }
   swipe_x_ = -1;
   swipe_y_ = -1;
   scrubbing_ = false;
   highlighted_tab_ = -1;
 }