| 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 08c985c93c5a1bbf93a0b560404c3a6c2247f457..5a7783d7ac19ba3a09c83ef37724d409038d6bbd 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
|
| @@ -41,7 +41,7 @@ class ContentSettingImageView : public gfx::AnimationDelegate,
|
| const gfx::FontList& font_list,
|
| SkColor text_color,
|
| SkColor parent_background_color);
|
| - virtual ~ContentSettingImageView();
|
| + ~ContentSettingImageView() override;
|
|
|
| // Updates the decoration from the shown WebContents.
|
| void Update(content::WebContents* web_contents);
|
| @@ -63,20 +63,20 @@ class ContentSettingImageView : public gfx::AnimationDelegate,
|
| static int GetBubbleOuterPadding(bool by_icon);
|
|
|
| // gfx::AnimationDelegate:
|
| - virtual void AnimationEnded(const gfx::Animation* animation) override;
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
| - virtual void AnimationCanceled(const gfx::Animation* animation) override;
|
| + void AnimationEnded(const gfx::Animation* animation) override;
|
| + void AnimationProgressed(const gfx::Animation* animation) override;
|
| + void AnimationCanceled(const gfx::Animation* animation) override;
|
|
|
| // views::View:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void Layout() override;
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseReleased(const ui::MouseEvent& event) override;
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| - virtual void OnPaintBackground(gfx::Canvas* canvas) override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
| + bool OnMousePressed(const ui::MouseEvent& event) override;
|
| + void OnMouseReleased(const ui::MouseEvent& event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
| + void OnPaintBackground(gfx::Canvas* canvas) override;
|
|
|
| // views::WidgetObserver:
|
| - virtual void OnWidgetDestroying(views::Widget* widget) override;
|
| + void OnWidgetDestroying(views::Widget* widget) override;
|
|
|
| bool background_showing() const {
|
| return slide_animator_.is_animating() || pause_animation_;
|
|
|