Index: chrome/browser/ui/panels/base_panel_browser_test.cc |
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc |
index 0411f6832585776ca389e415c3c2a64ab0e022c0..c75971d54e78f74e08074e54454e9fe5c13fc6d5 100644 |
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc |
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc |
@@ -62,36 +62,32 @@ class MockDisplaySettingsProviderImpl : |
public BasePanelBrowserTest::MockDisplaySettingsProvider { |
public: |
explicit MockDisplaySettingsProviderImpl(); |
- virtual ~MockDisplaySettingsProviderImpl() { } |
+ ~MockDisplaySettingsProviderImpl() override {} |
// Overridden from DisplaySettingsProvider: |
- virtual gfx::Rect GetPrimaryDisplayArea() const override; |
- virtual gfx::Rect GetPrimaryWorkArea() const override; |
- virtual gfx::Rect GetDisplayAreaMatching( |
- const gfx::Rect& bounds) const override; |
- virtual gfx::Rect GetWorkAreaMatching( |
- const gfx::Rect& bounds) const override; |
- virtual bool IsAutoHidingDesktopBarEnabled( |
- DesktopBarAlignment alignment) override; |
- virtual int GetDesktopBarThickness( |
+ gfx::Rect GetPrimaryDisplayArea() const override; |
+ gfx::Rect GetPrimaryWorkArea() const override; |
+ gfx::Rect GetDisplayAreaMatching(const gfx::Rect& bounds) const override; |
+ gfx::Rect GetWorkAreaMatching(const gfx::Rect& bounds) const override; |
+ bool IsAutoHidingDesktopBarEnabled(DesktopBarAlignment alignment) override; |
+ int GetDesktopBarThickness(DesktopBarAlignment alignment) const override; |
+ DesktopBarVisibility GetDesktopBarVisibility( |
DesktopBarAlignment alignment) const override; |
- virtual DesktopBarVisibility GetDesktopBarVisibility( |
- DesktopBarAlignment alignment) const override; |
- virtual bool IsFullScreen() override; |
+ bool IsFullScreen() override; |
// Overridden from MockDisplaySettingsProvider: |
- virtual void SetPrimaryDisplay( |
- const gfx::Rect& display_area, const gfx::Rect& work_area) override; |
- virtual void SetSecondaryDisplay( |
- const gfx::Rect& display_area, const gfx::Rect& work_area) override; |
- virtual void EnableAutoHidingDesktopBar(DesktopBarAlignment alignment, |
- bool enabled, |
- int thickness) override; |
- virtual void SetDesktopBarVisibility( |
- DesktopBarAlignment alignment, DesktopBarVisibility visibility) override; |
- virtual void SetDesktopBarThickness(DesktopBarAlignment alignment, |
- int thickness) override; |
- virtual void EnableFullScreenMode(bool enabled) override; |
+ void SetPrimaryDisplay(const gfx::Rect& display_area, |
+ const gfx::Rect& work_area) override; |
+ void SetSecondaryDisplay(const gfx::Rect& display_area, |
+ const gfx::Rect& work_area) override; |
+ void EnableAutoHidingDesktopBar(DesktopBarAlignment alignment, |
+ bool enabled, |
+ int thickness) override; |
+ void SetDesktopBarVisibility(DesktopBarAlignment alignment, |
+ DesktopBarVisibility visibility) override; |
+ void SetDesktopBarThickness(DesktopBarAlignment alignment, |
+ int thickness) override; |
+ void EnableFullScreenMode(bool enabled) override; |
private: |
gfx::Rect primary_display_area_; |