| Index: chrome/browser/ui/views/location_bar/suggested_text_view.cc
|
| diff --git a/chrome/browser/ui/views/location_bar/suggested_text_view.cc b/chrome/browser/ui/views/location_bar/suggested_text_view.cc
|
| index 512a3886f6b5d78752926d0b71dbfb726838b482..4c0d2082358ca9b655e09e566c5286f1767fcaec 100644
|
| --- a/chrome/browser/ui/views/location_bar/suggested_text_view.cc
|
| +++ b/chrome/browser/ui/views/location_bar/suggested_text_view.cc
|
| @@ -10,12 +10,6 @@
|
| #include "gfx/canvas.h"
|
| #include "gfx/color_utils.h"
|
|
|
| -// Amount of time to wait before starting the animation.
|
| -static const int kPauseTimeMS = 1000;
|
| -
|
| -// Duration of the animation in which the colors change.
|
| -static const int kFadeInTimeMS = 300;
|
| -
|
| SuggestedTextView::SuggestedTextView(LocationBarView* location_bar)
|
| : location_bar_(location_bar),
|
| bg_color_(0) {
|
| @@ -78,8 +72,10 @@ void SuggestedTextView::AnimationCanceled(const Animation* animation) {
|
|
|
| Animation* SuggestedTextView::CreateAnimation() {
|
| MultiAnimation::Parts parts;
|
| - parts.push_back(MultiAnimation::Part(kPauseTimeMS, Tween::ZERO));
|
| - parts.push_back(MultiAnimation::Part(kFadeInTimeMS, Tween::EASE_IN));
|
| + parts.push_back(MultiAnimation::Part(
|
| + InstantController::kAutoCommitPauseTimeMS, Tween::ZERO));
|
| + parts.push_back(MultiAnimation::Part(
|
| + InstantController::kAutoCommitFadeInTimeMS, Tween::EASE_IN));
|
| MultiAnimation* animation = new MultiAnimation(parts);
|
| animation->set_delegate(this);
|
| animation->set_continuous(false);
|
|
|