X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fbrowser%2Frenderer_host%2Finput%2Finput_router_config_helper.cc;h=d78b6cb2a90732dabbc36036c0756c8e9b851438;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=18c5560a5391f2cca0063ca61c22a937cf8088ff;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/content/browser/renderer_host/input/input_router_config_helper.cc b/src/content/browser/renderer_host/input/input_router_config_helper.cc
index 18c5560..d78b6cb 100644
--- a/src/content/browser/renderer_host/input/input_router_config_helper.cc
+++ b/src/content/browser/renderer_host/input/input_router_config_helper.cc
@@ -9,7 +9,7 @@
 #include "ui/events/gesture_detection/gesture_detector.h"
 
 #if defined(USE_AURA)
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 #elif defined(OS_ANDROID)
 #include "ui/gfx/android/view_configuration.h"
 #include "ui/gfx/screen.h"
@@ -19,30 +19,32 @@ namespace content {
 namespace {
 
 #if defined(USE_AURA)
-
+// TODO(jdduke): Consolidate router configuration paths using
+// ui::GestureConfiguration.
 GestureEventQueue::Config GetGestureEventQueueConfig() {
   GestureEventQueue::Config config;
-
+  ui::GestureConfiguration* gesture_config =
+      ui::GestureConfiguration::GetInstance();
   config.debounce_interval = base::TimeDelta::FromMilliseconds(
-      ui::GestureConfiguration::scroll_debounce_interval_in_ms());
+      gesture_config->scroll_debounce_interval_in_ms());
 
   config.touchscreen_tap_suppression_config.enabled = true;
   config.touchscreen_tap_suppression_config.max_cancel_to_down_time =
       base::TimeDelta::FromMilliseconds(
-          ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms());
+          gesture_config->fling_max_cancel_to_down_time_in_ms());
 
   config.touchscreen_tap_suppression_config.max_tap_gap_time =
-      base::TimeDelta::FromMilliseconds(static_cast<int>(
-          ui::GestureConfiguration::semi_long_press_time_in_seconds() * 1000));
+      base::TimeDelta::FromMilliseconds(
+          gesture_config->semi_long_press_time_in_ms());
 
   config.touchpad_tap_suppression_config.enabled = true;
   config.touchpad_tap_suppression_config.max_cancel_to_down_time =
       base::TimeDelta::FromMilliseconds(
-          ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms());
+          gesture_config->fling_max_cancel_to_down_time_in_ms());
 
   config.touchpad_tap_suppression_config.max_tap_gap_time =
-      base::TimeDelta::FromMilliseconds(static_cast<int>(
-          ui::GestureConfiguration::fling_max_tap_gap_time_in_ms() * 1000));
+      base::TimeDelta::FromMilliseconds(
+          gesture_config->fling_max_tap_gap_time_in_ms());
 
   return config;
 }
@@ -51,7 +53,8 @@ TouchEventQueue::Config GetTouchEventQueueConfig() {
   TouchEventQueue::Config config;
 
   config.touchmove_slop_suppression_length_dips =
-      ui::GestureConfiguration::max_touch_move_in_pixels_for_click();
+      ui::GestureConfiguration::GetInstance()
+          ->max_touch_move_in_pixels_for_click();
 
   return config;
 }