| 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 f3bf525f7b2346dbf271f9aac3be6b34d6c93158..522aab4aa0bb9c3556b102ff5dbfd776f8a6b87b 100644
|
| --- a/ash/system/tray/fixed_sized_scroll_view.h
|
| +++ b/ash/system/tray/fixed_sized_scroll_view.h
|
| @@ -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;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual void Layout() override;
|
|
|
| protected:
|
| // Overridden from views::View:
|
| - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
|
| + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
|
|
| private:
|
| gfx::Size fixed_size_;
|
|
|