| Index: chrome/browser/ui/views/location_bar/suggested_text_view.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/location_bar/suggested_text_view.h (revision 70685)
|
| +++ chrome/browser/ui/views/location_bar/suggested_text_view.h (working copy)
|
| @@ -6,7 +6,7 @@
|
| #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_SUGGESTED_TEXT_VIEW_H_
|
| #pragma once
|
|
|
| -#include "app/animation_delegate.h"
|
| +#include "ui/base/animation/animation_delegate.h"
|
| #include "views/controls/label.h"
|
|
|
| class LocationBarView;
|
| @@ -15,7 +15,7 @@
|
| // Invoke |StartAnimation| to start an animation that when done invokes
|
| // |OnCommitSuggestedText| on the LocationBar to commit the suggested text.
|
| class SuggestedTextView : public views::Label,
|
| - public AnimationDelegate {
|
| + public ui::AnimationDelegate {
|
| public:
|
| explicit SuggestedTextView(LocationBarView* location_bar);
|
| virtual ~SuggestedTextView();
|
| @@ -33,20 +33,20 @@
|
| virtual void PaintBackground(gfx::Canvas* canvas);
|
|
|
| // AnimationDelegate overrides:
|
| - virtual void AnimationEnded(const Animation* animation);
|
| - virtual void AnimationProgressed(const Animation* animation);
|
| - virtual void AnimationCanceled(const Animation* animation);
|
| + virtual void AnimationEnded(const ui::Animation* animation);
|
| + virtual void AnimationProgressed(const ui::Animation* animation);
|
| + virtual void AnimationCanceled(const ui::Animation* animation);
|
|
|
| private:
|
| // Creates the animation to use.
|
| - Animation* CreateAnimation();
|
| + ui::Animation* CreateAnimation();
|
|
|
| // Resets the background color.
|
| void UpdateBackgroundColor();
|
|
|
| LocationBarView* location_bar_;
|
|
|
| - scoped_ptr<Animation> animation_;
|
| + scoped_ptr<ui::Animation> animation_;
|
|
|
| SkColor bg_color_;
|
|
|
|
|