| Index: chrome/browser/ui/views/autocomplete/autocomplete_result_view.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/autocomplete/autocomplete_result_view.h (revision 81359)
|
| +++ chrome/browser/ui/views/autocomplete/autocomplete_result_view.h (working copy)
|
| @@ -8,6 +8,8 @@
|
|
|
| #include "chrome/browser/autocomplete/autocomplete_match.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| +#include "ui/base/animation/animation_delegate.h"
|
| +#include "ui/base/animation/slide_animation.h"
|
| #include "ui/gfx/font.h"
|
| #include "ui/gfx/rect.h"
|
| #include "views/view.h"
|
| @@ -17,7 +19,8 @@
|
| class Canvas;
|
| }
|
|
|
| -class AutocompleteResultView : public views::View {
|
| +class AutocompleteResultView : public views::View,
|
| + private ui::AnimationDelegate {
|
| public:
|
| enum ResultViewState {
|
| NORMAL = 0,
|
| @@ -43,7 +46,7 @@
|
| // Updates the match used to paint the contents of this result view. We copy
|
| // the match so that we can continue to paint the last result even after the
|
| // model has changed.
|
| - void set_match(const AutocompleteMatch& match) { match_ = match; }
|
| + void SetMatch(const AutocompleteMatch& match);
|
| const gfx::Font& normal_font() const { return normal_font_; }
|
| const gfx::Font& bold_font() const { return bold_font_; }
|
| const gfx::Rect& text_bounds() const { return text_bounds_; }
|
| @@ -79,6 +82,9 @@
|
| int icon_vertical_padding_;
|
| int text_vertical_padding_;
|
|
|
| + // ui::AnimationDelegate:
|
| + virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
|
| +
|
| private:
|
| struct ClassificationData;
|
| typedef std::vector<ClassificationData> Classifications;
|
| @@ -130,8 +136,13 @@
|
| gfx::Rect icon_bounds_;
|
| gfx::Rect text_bounds_;
|
|
|
| + class IconLabelView;
|
| + scoped_ptr<IconLabelView> search_view_;
|
| +
|
| AutocompleteMatch match_;
|
|
|
| + scoped_ptr<ui::SlideAnimation> animation_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(AutocompleteResultView);
|
| };
|
|
|
|
|