Chromium Code Reviews| Index: chrome/browser/ui/views/location_bar/suggested_text_view.h |
| diff --git a/chrome/browser/ui/views/location_bar/suggested_text_view.h b/chrome/browser/ui/views/location_bar/suggested_text_view.h |
| index 6db9571fe9942fbadf1c2a9186636aa52eb6c157..8e5a1b55615d06e3259cdc935d126673f74596d2 100644 |
| --- a/chrome/browser/ui/views/location_bar/suggested_text_view.h |
| +++ b/chrome/browser/ui/views/location_bar/suggested_text_view.h |
| @@ -6,53 +6,15 @@ |
| #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_SUGGESTED_TEXT_VIEW_H_ |
| #include "base/compiler_specific.h" |
| -#include "ui/base/animation/animation_delegate.h" |
| #include "ui/views/controls/label.h" |
| -class OmniboxEditModel; |
| - |
| // SuggestedTextView is used to show the suggest text in the LocationBar. |
| -// Invoke |StartAnimation| to start an animation that when done invokes |
| -// |CommitSuggestedText| on the AutocompleteEdit to commit the suggested text. |
| -class SuggestedTextView : public views::Label, |
| - public ui::AnimationDelegate { |
| +class SuggestedTextView : public views::Label { |
| public: |
| - SuggestedTextView(OmniboxEditModel* edit_model, |
| - bool instant_extended_api_enabled); |
| + explicit SuggestedTextView(bool instant_extended_api_enabled); |
|
sky
2012/10/24 21:40:40
Can we get rid of this class entirely now?
sreeram
2012/10/24 22:16:14
Done.
|
| virtual ~SuggestedTextView(); |
| - // Starts the animation. If the animation is currently running it is stopped |
| - // and restarted. The animation transitions the suggested text to look like |
| - // selected text. When the animation completes |OnCommitSuggestedText| is |
| - // invoked on the LocationBar. |
| - void StartAnimation(); |
| - |
| - // Stops the animation. |
| - void StopAnimation(); |
| - |
| - // View overrides: |
| - virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; |
| - |
| - // AnimationDelegate overrides: |
| - virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; |
| - virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; |
| - virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE; |
| - |
| private: |
| - // Creates the animation to use. |
| - ui::Animation* CreateAnimation(); |
| - |
| - // Resets the background color. |
| - void UpdateBackgroundColor(); |
| - |
| - OmniboxEditModel* edit_model_; |
| - |
| - // True if Instant Extended API is enabled. |
| - const bool instant_extended_api_enabled_; |
| - |
| - scoped_ptr<ui::Animation> animation_; |
| - |
| - SkColor bg_color_; |
| DISALLOW_COPY_AND_ASSIGN(SuggestedTextView); |
| }; |