| Index: ash/system/tray/fixed_sized_scroll_view.h
|
| diff --git a/ash/system/tray/fixed_sized_scroll_view.h b/ash/system/tray/fixed_sized_scroll_view.h
|
| index 522aab4aa0bb9c3556b102ff5dbfd776f8a6b87b..1b1923a70d8d155477efae088a47bfb633edd55c 100644
|
| --- a/ash/system/tray/fixed_sized_scroll_view.h
|
| +++ b/ash/system/tray/fixed_sized_scroll_view.h
|
| @@ -15,7 +15,7 @@ namespace ash {
|
| class FixedSizedScrollView : public views::ScrollView {
|
| public:
|
| FixedSizedScrollView();
|
| - virtual ~FixedSizedScrollView();
|
| + ~FixedSizedScrollView() override;
|
|
|
| void SetContentsView(views::View* view);
|
|
|
| @@ -26,12 +26,12 @@ class FixedSizedScrollView : public views::ScrollView {
|
| void set_fixed_size(const gfx::Size& size) { fixed_size_ = size; }
|
|
|
| // Overridden from views::View:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void Layout() override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
|
|
| protected:
|
| // Overridden from views::View:
|
| - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
| + void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
|
|
| private:
|
| gfx::Size fixed_size_;
|
|
|