| Index: ash/wm/lock_layout_manager.h
|
| diff --git a/ash/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h
|
| index bdc8c01ed8977790f205780aac13d5b0ffc2c413..88e72fa5b5348b6bda1cfa10c7651897de8d7eef 100644
|
| --- a/ash/wm/lock_layout_manager.h
|
| +++ b/ash/wm/lock_layout_manager.h
|
| @@ -54,32 +54,32 @@ class ASH_EXPORT LockLayoutManager
|
| virtual ~LockLayoutManager();
|
|
|
| // 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 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;
|
| + bool visibile) override;
|
| virtual void SetChildBounds(aura::Window* child,
|
| - const gfx::Rect& requested_bounds) OVERRIDE;
|
| + const gfx::Rect& requested_bounds) override;
|
|
|
| // Overriden from aura::WindowObserver:
|
| virtual void OnWindowHierarchyChanged(
|
| - const WindowObserver::HierarchyChangeParams& params) OVERRIDE;
|
| + 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;
|
| + 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;
|
| + const gfx::Rect& new_bounds) override;
|
|
|
| // VirtualKeyboardStateObserver overrides:
|
| - virtual void OnVirtualKeyboardStateChanged(bool activated) OVERRIDE;
|
| + virtual void OnVirtualKeyboardStateChanged(bool activated) override;
|
|
|
| // keyboard::KeyboardControllerObserver overrides:
|
| - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE;
|
| + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
|
|
| private:
|
| // Adjusts the bounds of all managed windows when the display area changes.
|
|
|