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

Side by Side Diff: ash/wm/lock_state_controller.cc

Issue 697953002: ObserverList::HasObserver now takes a const pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile errors (ChromeOS unit tests). Created 6 years, 1 month 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_state_controller.h ('k') | base/observer_list.h » ('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 #include "ash/wm/lock_state_controller.h" 5 #include "ash/wm/lock_state_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accessibility_delegate.h" 10 #include "ash/accessibility_delegate.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 79
80 void LockStateController::AddObserver(LockStateObserver* observer) { 80 void LockStateController::AddObserver(LockStateObserver* observer) {
81 observers_.AddObserver(observer); 81 observers_.AddObserver(observer);
82 } 82 }
83 83
84 void LockStateController::RemoveObserver(LockStateObserver* observer) { 84 void LockStateController::RemoveObserver(LockStateObserver* observer) {
85 observers_.RemoveObserver(observer); 85 observers_.RemoveObserver(observer);
86 } 86 }
87 87
88 bool LockStateController::HasObserver(LockStateObserver* observer) { 88 bool LockStateController::HasObserver(const LockStateObserver* observer) const {
89 return observers_.HasObserver(observer); 89 return observers_.HasObserver(observer);
90 } 90 }
91 91
92 void LockStateController::StartLockAnimation( 92 void LockStateController::StartLockAnimation(
93 bool shutdown_after_lock) { 93 bool shutdown_after_lock) {
94 if (animating_lock_) 94 if (animating_lock_)
95 return; 95 return;
96 shutdown_after_lock_ = shutdown_after_lock; 96 shutdown_after_lock_ = shutdown_after_lock;
97 can_cancel_lock_animation_ = true; 97 can_cancel_lock_animation_ = true;
98 98
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 if (unlocked_properties_.get() && 565 if (unlocked_properties_.get() &&
566 unlocked_properties_->background_is_hidden) { 566 unlocked_properties_->background_is_hidden) {
567 animation_sequence->StartAnimation( 567 animation_sequence->StartAnimation(
568 SessionStateAnimator::DESKTOP_BACKGROUND, 568 SessionStateAnimator::DESKTOP_BACKGROUND,
569 SessionStateAnimator::ANIMATION_FADE_OUT, 569 SessionStateAnimator::ANIMATION_FADE_OUT,
570 speed); 570 speed);
571 } 571 }
572 } 572 }
573 573
574 } // namespace ash 574 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | base/observer_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698