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

Side by Side Diff: ash/wm/lock_state_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/lock_layout_manager_unittest.cc ('k') | ash/wm/lock_state_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_LOCK_STATE_CONTROLLER_H_ 5 #ifndef ASH_WM_LOCK_STATE_CONTROLLER_H_
6 #define ASH_WM_LOCK_STATE_CONTROLLER_H_ 6 #define ASH_WM_LOCK_STATE_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "ash/wm/lock_state_observer.h" 10 #include "ash/wm/lock_state_observer.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 // Called when ScreenLocker is ready to close, but not yet destroyed. 193 // Called when ScreenLocker is ready to close, but not yet destroyed.
194 // Can be used to display "hiding" animations on unlock. 194 // Can be used to display "hiding" animations on unlock.
195 // |callback| will be called when all animations are done. 195 // |callback| will be called when all animations are done.
196 void OnLockScreenHide(base::Closure& callback); 196 void OnLockScreenHide(base::Closure& callback);
197 197
198 // Sets up the callback that should be called once lock animation is finished. 198 // Sets up the callback that should be called once lock animation is finished.
199 // Callback is guaranteed to be called once and then discarded. 199 // Callback is guaranteed to be called once and then discarded.
200 void SetLockScreenDisplayedCallback(const base::Closure& callback); 200 void SetLockScreenDisplayedCallback(const base::Closure& callback);
201 201
202 // aura::WindowTreeHostObserver override: 202 // aura::WindowTreeHostObserver override:
203 virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE; 203 virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
204 204
205 // ShellObserver overrides: 205 // ShellObserver overrides:
206 virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE; 206 virtual void OnLoginStateChanged(user::LoginStatus status) override;
207 virtual void OnAppTerminating() OVERRIDE; 207 virtual void OnAppTerminating() override;
208 virtual void OnLockStateChanged(bool locked) OVERRIDE; 208 virtual void OnLockStateChanged(bool locked) override;
209 209
210 void set_animator_for_test(SessionStateAnimator* animator) { 210 void set_animator_for_test(SessionStateAnimator* animator) {
211 animator_.reset(animator); 211 animator_.reset(animator);
212 } 212 }
213 213
214 private: 214 private:
215 friend class test::PowerButtonControllerTest; 215 friend class test::PowerButtonControllerTest;
216 friend class test::LockStateControllerTest; 216 friend class test::LockStateControllerTest;
217 217
218 struct UnlockedStateProperties { 218 struct UnlockedStateProperties {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 base::Closure lock_screen_displayed_callback_; 326 base::Closure lock_screen_displayed_callback_;
327 327
328 base::WeakPtrFactory<LockStateController> weak_ptr_factory_; 328 base::WeakPtrFactory<LockStateController> weak_ptr_factory_;
329 329
330 DISALLOW_COPY_AND_ASSIGN(LockStateController); 330 DISALLOW_COPY_AND_ASSIGN(LockStateController);
331 }; 331 };
332 332
333 } // namespace ash 333 } // namespace ash
334 334
335 #endif // ASH_WM_LOCK_STATE_CONTROLLER_H_ 335 #endif // ASH_WM_LOCK_STATE_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/wm/lock_layout_manager_unittest.cc ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698