| Index: ash/wm/lock_layout_manager.h
|
| diff --git a/ash/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h
|
| index 88e72fa5b5348b6bda1cfa10c7651897de8d7eef..716baf0dae106f6147b5be2c2e5df0cba838bbaf 100644
|
| --- a/ash/wm/lock_layout_manager.h
|
| +++ b/ash/wm/lock_layout_manager.h
|
| @@ -51,35 +51,35 @@ class ASH_EXPORT LockLayoutManager
|
| public keyboard::KeyboardControllerObserver {
|
| public:
|
| explicit LockLayoutManager(aura::Window* window);
|
| - virtual ~LockLayoutManager();
|
| + ~LockLayoutManager() override;
|
|
|
| // Overridden from aura::LayoutManager:
|
| - virtual void OnWindowResized() override;
|
| - virtual void OnWindowAddedToLayout(aura::Window* child) override;
|
| - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override;
|
| - virtual void OnWindowRemovedFromLayout(aura::Window* child) override;
|
| - virtual void OnChildWindowVisibilityChanged(aura::Window* child,
|
| - bool visibile) override;
|
| - virtual void SetChildBounds(aura::Window* child,
|
| - const gfx::Rect& requested_bounds) override;
|
| + void OnWindowResized() override;
|
| + void OnWindowAddedToLayout(aura::Window* child) override;
|
| + void OnWillRemoveWindowFromLayout(aura::Window* child) override;
|
| + void OnWindowRemovedFromLayout(aura::Window* child) override;
|
| + void OnChildWindowVisibilityChanged(aura::Window* child,
|
| + bool visibile) override;
|
| + void SetChildBounds(aura::Window* child,
|
| + const gfx::Rect& requested_bounds) override;
|
|
|
| // Overriden from aura::WindowObserver:
|
| - virtual void OnWindowHierarchyChanged(
|
| + void OnWindowHierarchyChanged(
|
| const WindowObserver::HierarchyChangeParams& params) override;
|
| - virtual void OnWindowPropertyChanged(aura::Window* window,
|
| - const void* key,
|
| - intptr_t old) override;
|
| - virtual void OnWindowStackingChanged(aura::Window* window) override;
|
| - virtual void OnWindowDestroying(aura::Window* window) override;
|
| - virtual void OnWindowBoundsChanged(aura::Window* window,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) override;
|
| + void OnWindowPropertyChanged(aura::Window* window,
|
| + const void* key,
|
| + intptr_t old) override;
|
| + void OnWindowStackingChanged(aura::Window* window) override;
|
| + void OnWindowDestroying(aura::Window* window) override;
|
| + void OnWindowBoundsChanged(aura::Window* window,
|
| + const gfx::Rect& old_bounds,
|
| + const gfx::Rect& new_bounds) override;
|
|
|
| // VirtualKeyboardStateObserver overrides:
|
| - virtual void OnVirtualKeyboardStateChanged(bool activated) override;
|
| + void OnVirtualKeyboardStateChanged(bool activated) override;
|
|
|
| // keyboard::KeyboardControllerObserver overrides:
|
| - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
| + void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
|
|
| private:
|
| // Adjusts the bounds of all managed windows when the display area changes.
|
|
|