Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: ash/wm/app_list_controller.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/always_on_top_controller.h ('k') | ash/wm/app_list_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_ 5 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_
6 #define ASH_WM_APP_LIST_CONTROLLER_H_ 6 #define ASH_WM_APP_LIST_CONTROLLER_H_
7 7
8 #include "ash/shelf/shelf_icon_observer.h" 8 #include "ash/shelf/shelf_icon_observer.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 // Starts show/hide animation. 86 // Starts show/hide animation.
87 void ScheduleAnimation(); 87 void ScheduleAnimation();
88 88
89 void ProcessLocatedEvent(ui::LocatedEvent* event); 89 void ProcessLocatedEvent(ui::LocatedEvent* event);
90 90
91 // Makes app list bubble update its bounds. 91 // Makes app list bubble update its bounds.
92 void UpdateBounds(); 92 void UpdateBounds();
93 93
94 // ui::EventHandler overrides: 94 // ui::EventHandler overrides:
95 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 95 virtual void OnMouseEvent(ui::MouseEvent* event) override;
96 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 96 virtual void OnGestureEvent(ui::GestureEvent* event) override;
97 97
98 // aura::client::FocusChangeObserver overrides: 98 // aura::client::FocusChangeObserver overrides:
99 virtual void OnWindowFocused(aura::Window* gained_focus, 99 virtual void OnWindowFocused(aura::Window* gained_focus,
100 aura::Window* lost_focus) OVERRIDE; 100 aura::Window* lost_focus) override;
101 101
102 // aura::WindowObserver overrides: 102 // aura::WindowObserver overrides:
103 virtual void OnWindowBoundsChanged(aura::Window* root, 103 virtual void OnWindowBoundsChanged(aura::Window* root,
104 const gfx::Rect& old_bounds, 104 const gfx::Rect& old_bounds,
105 const gfx::Rect& new_bounds) OVERRIDE; 105 const gfx::Rect& new_bounds) override;
106 106
107 // ui::ImplicitAnimationObserver overrides: 107 // ui::ImplicitAnimationObserver overrides:
108 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 108 virtual void OnImplicitAnimationsCompleted() override;
109 109
110 // views::WidgetObserver overrides: 110 // views::WidgetObserver overrides:
111 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 111 virtual void OnWidgetDestroying(views::Widget* widget) override;
112 112
113 // KeyboardControllerObserver overrides: 113 // KeyboardControllerObserver overrides:
114 virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; 114 virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
115 115
116 // ShellObserver overrides: 116 // ShellObserver overrides:
117 virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE; 117 virtual void OnShelfAlignmentChanged(aura::Window* root_window) override;
118 118
119 // ShelfIconObserver overrides: 119 // ShelfIconObserver overrides:
120 virtual void OnShelfIconPositionsChanged() OVERRIDE; 120 virtual void OnShelfIconPositionsChanged() override;
121 121
122 // app_list::PaginationModelObserver overrides: 122 // app_list::PaginationModelObserver overrides:
123 virtual void TotalPagesChanged() OVERRIDE; 123 virtual void TotalPagesChanged() override;
124 virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; 124 virtual void SelectedPageChanged(int old_selected, int new_selected) override;
125 virtual void TransitionStarted() OVERRIDE; 125 virtual void TransitionStarted() override;
126 virtual void TransitionChanged() OVERRIDE; 126 virtual void TransitionChanged() override;
127 127
128 // Whether we should show or hide app list widget. 128 // Whether we should show or hide app list widget.
129 bool is_visible_; 129 bool is_visible_;
130 130
131 // Whether the app list should remain centered. 131 // Whether the app list should remain centered.
132 bool is_centered_; 132 bool is_centered_;
133 133
134 // The AppListView this class manages, owned by its widget. 134 // The AppListView this class manages, owned by its widget.
135 app_list::AppListView* view_; 135 app_list::AppListView* view_;
136 136
137 // The current page of the AppsGridView of |view_|. This is stored outside of 137 // The current page of the AppsGridView of |view_|. This is stored outside of
138 // the view's PaginationModel, so that it persists when the view is destroyed. 138 // the view's PaginationModel, so that it persists when the view is destroyed.
139 int current_apps_page_; 139 int current_apps_page_;
140 140
141 // Cached bounds of |view_| for snapping back animation after over-scroll. 141 // Cached bounds of |view_| for snapping back animation after over-scroll.
142 gfx::Rect view_bounds_; 142 gfx::Rect view_bounds_;
143 143
144 // Whether should schedule snap back animation. 144 // Whether should schedule snap back animation.
145 bool should_snap_back_; 145 bool should_snap_back_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(AppListController); 147 DISALLOW_COPY_AND_ASSIGN(AppListController);
148 }; 148 };
149 149
150 } // namespace ash 150 } // namespace ash
151 151
152 #endif // ASH_WM_APP_LIST_CONTROLLER_H_ 152 #endif // ASH_WM_APP_LIST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/wm/always_on_top_controller.h ('k') | ash/wm/app_list_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698