| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index 0b79b206db1e7c622ce7d677d2eff42fbbbf7b35..1494c96f3c114073c635d82a1fdef2ab2cc21374 100644
|
| --- a/ash/root_window_controller.h
|
| +++ b/ash/root_window_controller.h
|
| @@ -105,7 +105,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
| // Returns container which contains a given |window|.
|
| static aura::Window* GetContainerForWindow(aura::Window* window);
|
|
|
| - virtual ~RootWindowController();
|
| + ~RootWindowController() override;
|
|
|
| AshWindowTreeHost* ash_host() { return ash_host_.get(); }
|
| const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
|
| @@ -267,8 +267,8 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
| void DisableTouchHudProjection();
|
|
|
| // Overridden from ShellObserver.
|
| - virtual void OnLoginStateChanged(user::LoginStatus status) override;
|
| - virtual void OnTouchHudProjectionToggled(bool enabled) override;
|
| + void OnLoginStateChanged(user::LoginStatus status) override;
|
| + void OnTouchHudProjectionToggled(bool enabled) override;
|
|
|
| scoped_ptr<AshWindowTreeHost> ash_host_;
|
| RootWindowLayoutManager* root_window_layout_;
|
|
|