Index: ash/wm/workspace/workspace_layout_manager.h |
diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h |
index ae0c03a6eb8aece96533a9504ed5de08173105d2..2eb81077277f644c5dcc61d8d064bcd36c97f5c6 100644 |
--- a/ash/wm/workspace/workspace_layout_manager.h |
+++ b/ash/wm/workspace/workspace_layout_manager.h |
@@ -48,7 +48,7 @@ class ASH_EXPORT WorkspaceLayoutManager |
public wm::WindowStateObserver { |
public: |
explicit WorkspaceLayoutManager(aura::Window* window); |
- virtual ~WorkspaceLayoutManager(); |
+ ~WorkspaceLayoutManager() override; |
void SetShelf(ShelfLayoutManager* shelf); |
@@ -59,41 +59,40 @@ class ASH_EXPORT WorkspaceLayoutManager |
scoped_ptr<WorkspaceLayoutManagerDelegate> delegate); |
// 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; |
// ash::ShellObserver overrides: |
- virtual void OnDisplayWorkAreaInsetsChanged() override; |
+ void OnDisplayWorkAreaInsetsChanged() override; |
// Overriden from 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; |
// aura::client::ActivationChangeObserver overrides: |
- virtual void OnWindowActivated(aura::Window* gained_active, |
- aura::Window* lost_active) override; |
+ void OnWindowActivated(aura::Window* gained_active, |
+ aura::Window* lost_active) override; |
// keyboard::KeyboardControllerObserver overrides: |
- virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; |
+ void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; |
// WindowStateObserver overrides: |
- virtual void OnPostWindowStateTypeChange( |
- wm::WindowState* window_state, |
- wm::WindowStateType old_type) override; |
+ void OnPostWindowStateTypeChange(wm::WindowState* window_state, |
+ wm::WindowStateType old_type) override; |
private: |
typedef std::set<aura::Window*> WindowSet; |