| Index: extensions/shell/browser/shell_desktop_controller.h
|
| diff --git a/extensions/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller.h
|
| index 0b75e6b4b5b81becd0af614d0bdc20cb78a6a212..2087234ac820053926e83c86d0bc975c898d4e22 100644
|
| --- a/extensions/shell/browser/shell_desktop_controller.h
|
| +++ b/extensions/shell/browser/shell_desktop_controller.h
|
| @@ -64,20 +64,20 @@ class ShellDesktopController : public DesktopController,
|
| public aura::WindowTreeHostObserver {
|
| public:
|
| ShellDesktopController();
|
| - virtual ~ShellDesktopController();
|
| + ~ShellDesktopController() override;
|
|
|
| // DesktopController:
|
| - virtual aura::WindowTreeHost* GetHost() override;
|
| - virtual AppWindow* CreateAppWindow(content::BrowserContext* context,
|
| - const Extension* extension) override;
|
| - virtual void AddAppWindow(aura::Window* window) override;
|
| - virtual void RemoveAppWindow(AppWindow* window) override;
|
| - virtual void CloseAppWindows() override;
|
| + aura::WindowTreeHost* GetHost() override;
|
| + AppWindow* CreateAppWindow(content::BrowserContext* context,
|
| + const Extension* extension) override;
|
| + void AddAppWindow(aura::Window* window) override;
|
| + void RemoveAppWindow(AppWindow* window) override;
|
| + void CloseAppWindows() override;
|
|
|
| // aura::client::WindowTreeClient overrides:
|
| - virtual aura::Window* GetDefaultParent(aura::Window* context,
|
| - aura::Window* window,
|
| - const gfx::Rect& bounds) override;
|
| + aura::Window* GetDefaultParent(aura::Window* context,
|
| + aura::Window* window,
|
| + const gfx::Rect& bounds) override;
|
|
|
| #if defined(OS_CHROMEOS)
|
| // chromeos::PowerManagerClient::Observer overrides:
|
| @@ -91,7 +91,7 @@ class ShellDesktopController : public DesktopController,
|
| #endif
|
|
|
| // aura::WindowTreeHostObserver overrides:
|
| - virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
|
| + void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
|
|
|
| protected:
|
| // Creates and sets the aura clients and window manager stuff. Subclass may
|
|
|