| Index: ash/wm/app_list_controller.h
|
| diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h
|
| index d772dd5317b4d7facda899dac19a87c80d3fff0a..b5dc8f38d34d18afa67ecfc56faaa1334cbdc0ec 100644
|
| --- a/ash/wm/app_list_controller.h
|
| +++ b/ash/wm/app_list_controller.h
|
| @@ -48,7 +48,7 @@ class AppListController : public ui::EventHandler,
|
| public app_list::PaginationModelObserver {
|
| public:
|
| AppListController();
|
| - virtual ~AppListController();
|
| + ~AppListController() override;
|
|
|
| // Show/hide app list window. The |window| is used to deterime in
|
| // which display (in which the |window| exists) the app list should
|
| @@ -92,38 +92,38 @@ class AppListController : public ui::EventHandler,
|
| void UpdateBounds();
|
|
|
| // ui::EventHandler overrides:
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) override;
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| + void OnMouseEvent(ui::MouseEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| // aura::client::FocusChangeObserver overrides:
|
| - virtual void OnWindowFocused(aura::Window* gained_focus,
|
| - aura::Window* lost_focus) override;
|
| + void OnWindowFocused(aura::Window* gained_focus,
|
| + aura::Window* lost_focus) override;
|
|
|
| // aura::WindowObserver overrides:
|
| - virtual void OnWindowBoundsChanged(aura::Window* root,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) override;
|
| + void OnWindowBoundsChanged(aura::Window* root,
|
| + const gfx::Rect& old_bounds,
|
| + const gfx::Rect& new_bounds) override;
|
|
|
| // ui::ImplicitAnimationObserver overrides:
|
| - virtual void OnImplicitAnimationsCompleted() override;
|
| + void OnImplicitAnimationsCompleted() override;
|
|
|
| // views::WidgetObserver overrides:
|
| - virtual void OnWidgetDestroying(views::Widget* widget) override;
|
| + void OnWidgetDestroying(views::Widget* widget) override;
|
|
|
| // KeyboardControllerObserver overrides:
|
| - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
| + void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
|
|
| // ShellObserver overrides:
|
| - virtual void OnShelfAlignmentChanged(aura::Window* root_window) override;
|
| + void OnShelfAlignmentChanged(aura::Window* root_window) override;
|
|
|
| // ShelfIconObserver overrides:
|
| - virtual void OnShelfIconPositionsChanged() override;
|
| + void OnShelfIconPositionsChanged() override;
|
|
|
| // app_list::PaginationModelObserver overrides:
|
| - virtual void TotalPagesChanged() override;
|
| - virtual void SelectedPageChanged(int old_selected, int new_selected) override;
|
| - virtual void TransitionStarted() override;
|
| - virtual void TransitionChanged() override;
|
| + void TotalPagesChanged() override;
|
| + void SelectedPageChanged(int old_selected, int new_selected) override;
|
| + void TransitionStarted() override;
|
| + void TransitionChanged() override;
|
|
|
| // Whether we should show or hide app list widget.
|
| bool is_visible_;
|
|
|