| Index: ash/wm/maximize_mode/maximize_mode_window_manager.h
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h
|
| index dd8c91f93064fa96675407aa0e591fee6870ef97..c6cba668ab8fc79c45c1235ccc06a51dd2f7af88 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_window_manager.h
|
| +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h
|
| @@ -37,7 +37,7 @@ class ASH_EXPORT MaximizeModeWindowManager : public aura::WindowObserver,
|
| public ui::EventHandler {
|
| public:
|
| // This should only be deleted by the creator (ash::Shell).
|
| - virtual ~MaximizeModeWindowManager();
|
| + ~MaximizeModeWindowManager() override;
|
|
|
| // Returns the number of maximized & tracked windows by this manager.
|
| int GetNumberOfManagedWindows();
|
| @@ -52,24 +52,24 @@ class ASH_EXPORT MaximizeModeWindowManager : public aura::WindowObserver,
|
| void WindowStateDestroyed(aura::Window* window);
|
|
|
| // ShellObserver overrides:
|
| - virtual void OnOverviewModeStarting() override;
|
| - virtual void OnOverviewModeEnding() override;
|
| + void OnOverviewModeStarting() override;
|
| + void OnOverviewModeEnding() override;
|
|
|
| // Overridden from WindowObserver:
|
| - virtual void OnWindowDestroying(aura::Window* window) override;
|
| - virtual void OnWindowAdded(aura::Window* window) override;
|
| - virtual void OnWindowBoundsChanged(aura::Window* window,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) override;
|
| + void OnWindowDestroying(aura::Window* window) override;
|
| + void OnWindowAdded(aura::Window* window) override;
|
| + void OnWindowBoundsChanged(aura::Window* window,
|
| + const gfx::Rect& old_bounds,
|
| + const gfx::Rect& new_bounds) override;
|
|
|
| // gfx::DisplayObserver overrides:
|
| - virtual void OnDisplayAdded(const gfx::Display& display) override;
|
| - virtual void OnDisplayRemoved(const gfx::Display& display) override;
|
| - virtual void OnDisplayMetricsChanged(const gfx::Display& display,
|
| - uint32_t metrics) override;
|
| + void OnDisplayAdded(const gfx::Display& display) override;
|
| + void OnDisplayRemoved(const gfx::Display& display) override;
|
| + void OnDisplayMetricsChanged(const gfx::Display& display,
|
| + uint32_t metrics) override;
|
|
|
| // ui::EventHandler override:
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) override;
|
| + void OnTouchEvent(ui::TouchEvent* event) override;
|
|
|
| protected:
|
| friend class MaximizeModeController;
|
|
|