| Index: chrome/browser/ui/views/location_bar/origin_chip_view.h
|
| diff --git a/chrome/browser/ui/views/location_bar/origin_chip_view.h b/chrome/browser/ui/views/location_bar/origin_chip_view.h
|
| index b0a8046ca461e25f0955e002bed7566a5a34fec4..b0e154404abb2515b5e6f1b4b028db5a37db9310 100644
|
| --- a/chrome/browser/ui/views/location_bar/origin_chip_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/origin_chip_view.h
|
| @@ -41,7 +41,7 @@ class OriginChipView : public views::LabelButton,
|
| OriginChipView(LocationBarView* location_bar_view,
|
| Profile* profile,
|
| const gfx::FontList& font_list);
|
| - virtual ~OriginChipView();
|
| + ~OriginChipView() override;
|
|
|
| SkColor pressed_text_color() const { return pressed_text_color_; }
|
| SkColor pressed_background_color() const {
|
| @@ -68,8 +68,8 @@ class OriginChipView : public views::LabelButton,
|
| int WidthFromStartOfLabels() const;
|
|
|
| // views::LabelButton:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void Layout() override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
|
|
| private:
|
| // Returns the X coordinate the first label should be placed at.
|
| @@ -79,19 +79,18 @@ class OriginChipView : public views::LabelButton,
|
| void SetBorderImages(const int images[3][9]);
|
|
|
| // views::LabelButton:
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
| - virtual void AnimationEnded(const gfx::Animation* animation) override;
|
| - virtual void OnPaintBorder(gfx::Canvas* canvas) override;
|
| - virtual void StateChanged() override;
|
| + void AnimationProgressed(const gfx::Animation* animation) override;
|
| + void AnimationEnded(const gfx::Animation* animation) override;
|
| + void OnPaintBorder(gfx::Canvas* canvas) override;
|
| + void StateChanged() override;
|
|
|
| // views::ButtonListener:
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| // SafeBrowsingUIManager::Observer:
|
| - virtual void OnSafeBrowsingHit(
|
| + void OnSafeBrowsingHit(
|
| const SafeBrowsingUIManager::UnsafeResource& resource) override;
|
| - virtual void OnSafeBrowsingMatch(
|
| + void OnSafeBrowsingMatch(
|
| const SafeBrowsingUIManager::UnsafeResource& resource) override;
|
|
|
| LocationBarView* location_bar_view_;
|
|
|