Change GestureConfiguration types to be consistent with each other and with the

ash/wm/gestures/long_press_affordance_handler.cc

 // Copyright (c) 2012 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 "ash/wm/gestures/long_press_affordance_handler.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 236 matching lines @@
                                               ui::GestureEvent* event) {
   // Once we have a target, we are only interested in events with that target.
   if (tap_down_target_ && tap_down_target_ != target)
     return;
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN: {
       // Start timer that will start animation on "semi-long-press".
       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:
     case ui::ET_GESTURE_TAP_CANCEL:
       StopAffordance();
       break;
     case ui::ET_GESTURE_LONG_PRESS:
       End();
       break;
     default:
       break;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LongPressAffordanceHandler, private
 
 void LongPressAffordanceHandler::StartAnimation() {
   switch (current_animation_type_) {
     case GROW_ANIMATION: {
       aura::Window* root_window = tap_down_target_->GetRootWindow();
       if (!root_window) {
         StopAffordance();
         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;
     }
     case SHRINK_ANIMATION:
       SetDuration(kAffordanceShrinkAnimationDurationMs);
       Start();
       break;
     default:
       NOTREACHED();
@@ skipping 56 matching lines @@
       break;
   }
 }
 
 void LongPressAffordanceHandler::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(tap_down_target_, window);
   StopAffordance();
 }
 
 }  // namespace ash