| Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| index ef6ffd1056aa3ce41ef1c4659978654b86714f61..07a9c61c1991b9cb9429a4897bad1686c461970d 100644
|
| --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| @@ -37,26 +37,27 @@ class ContentSettingImageView : public views::ImageView,
|
| // just switched to.
|
| void UpdateFromTabContents(TabContents* tab_contents);
|
|
|
| - // views::View overrides:
|
| + // views::View/ImageView overrides:
|
| virtual gfx::Size GetPreferredSize();
|
| -
|
| - private:
|
| - // views::ImageView overrides:
|
| - virtual bool OnMousePressed(const views::MouseEvent& event);
|
| - virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
|
| - virtual void VisibilityChanged(View* starting_from, bool is_visible);
|
| - virtual void OnPaint(gfx::Canvas* canvas);
|
| - virtual void OnPaintBackground(gfx::Canvas* canvas);
|
| + virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
|
|
| // InfoBubbleDelegate overrides:
|
| virtual void InfoBubbleClosing(InfoBubble* info_bubble,
|
| - bool closed_by_escape);
|
| - virtual bool CloseOnEscape();
|
| - virtual bool FadeInOnShow();
|
| + bool closed_by_escape) OVERRIDE;
|
| + virtual bool CloseOnEscape() OVERRIDE;
|
| + virtual bool FadeInOnShow() OVERRIDE;
|
| +
|
| + protected:
|
| + // views::View/ImageView overrides:
|
| + virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
|
| + virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| + virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
|
|
|
| // ui::LinearAnimation override:
|
| - virtual void AnimateToState(double state);
|
| + virtual void AnimateToState(double state) OVERRIDE;
|
|
|
| + private:
|
| scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
|
|
|
| // The owning LocationBarView.
|
|
|