Adopt ui::GestureConfiguration on Android

chrome/browser/ui/gesture_prefs_observer_factory_aura.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/gesture_prefs_observer_factory_aura.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "content/public/common/renderer_preferences.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 
 using ui::GestureConfiguration;
 
 namespace {
 
 struct OverscrollPref {
   const char* pref_name;
   content::OverscrollConfig config;
 };
 
@@ skipping 101 matching lines @@
   Update();
 }
 
 GesturePrefsObserver::~GesturePrefsObserver() {}
 
 void GesturePrefsObserver::Shutdown() {
   registrar_.RemoveAll();
 }
 
 void GesturePrefsObserver::Update() {
-  GestureConfiguration::set_fling_max_cancel_to_down_time_in_ms(
+  GestureConfiguration::GetInstance()->set_fling_max_cancel_to_down_time_in_ms(
       prefs_->GetInteger(prefs::kFlingMaxCancelToDownTimeInMs));
-  GestureConfiguration::set_fling_max_tap_gap_time_in_ms(
+  GestureConfiguration::GetInstance()->set_fling_max_tap_gap_time_in_ms(
       prefs_->GetInteger(prefs::kFlingMaxTapGapTimeInMs));
-  GestureConfiguration::set_tab_scrub_activation_delay_in_ms(
+  GestureConfiguration::GetInstance()->set_tab_scrub_activation_delay_in_ms(
       prefs_->GetInteger(prefs::kTabScrubActivationDelayInMS));
-  GestureConfiguration::set_semi_long_press_time_in_seconds(
+  GestureConfiguration::GetInstance()->set_semi_long_press_time_in_seconds(
       prefs_->GetDouble(prefs::kSemiLongPressTimeInSeconds));
-  GestureConfiguration::set_max_separation_for_gesture_touches_in_pixels(
-      prefs_->GetDouble(prefs::kMaxSeparationForGestureTouchesInPixels));
+  GestureConfiguration::GetInstance()
+      ->set_max_separation_for_gesture_touches_in_pixels(
+          prefs_->GetDouble(prefs::kMaxSeparationForGestureTouchesInPixels));
 
   UpdateOverscrollPrefs();
 }
 
 void GesturePrefsObserver::UpdateOverscrollPrefs() {
   const std::vector<OverscrollPref>& overscroll_prefs = GetOverscrollPrefs();
   for (size_t i = 0; i < overscroll_prefs.size(); ++i) {
     content::SetOverscrollConfig(overscroll_prefs[i].config,
         static_cast<float>(prefs_->GetDouble(overscroll_prefs[i].pref_name)));
   }
@@ skipping 37 matching lines @@
         overscroll_prefs[i].pref_name,
         content::GetOverscrollConfig(overscroll_prefs[i].config),
         user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 }
 
 void GesturePrefsObserverFactoryAura::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kFlingMaxCancelToDownTimeInMs,
-      GestureConfiguration::fling_max_cancel_to_down_time_in_ms(),
+      GestureConfiguration::GetInstance()
+          ->fling_max_cancel_to_down_time_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kFlingMaxTapGapTimeInMs,
-      GestureConfiguration::fling_max_tap_gap_time_in_ms(),
+      GestureConfiguration::GetInstance()->fling_max_tap_gap_time_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kTabScrubActivationDelayInMS,
-      GestureConfiguration::tab_scrub_activation_delay_in_ms(),
+      GestureConfiguration::GetInstance()->tab_scrub_activation_delay_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDoublePref(
       prefs::kSemiLongPressTimeInSeconds,
-      GestureConfiguration::semi_long_press_time_in_seconds(),
+      GestureConfiguration::GetInstance()->semi_long_press_time_in_seconds(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDoublePref(
       prefs::kMaxSeparationForGestureTouchesInPixels,
-      GestureConfiguration::max_separation_for_gesture_touches_in_pixels(),
+      GestureConfiguration::GetInstance()
+          ->max_separation_for_gesture_touches_in_pixels(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   RegisterOverscrollPrefs(registry);
 }
 
 bool
 GesturePrefsObserverFactoryAura::ServiceIsCreatedWithBrowserContext() const {
   // Create the observer as soon as the profile is created.
   return true;
 }
 
 content::BrowserContext*
 GesturePrefsObserverFactoryAura::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Use same gesture preferences on incognito windows.
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const {
   // Some tests replace the PrefService of the TestingProfile after the
   // GesturePrefsObserver has been created, which makes Shutdown()
   // remove the registrar from a non-existent PrefService.
   return true;
 }