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

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

Issue 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)
Patch Set: feedback Created 3 years, 9 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
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 #include <utility> 9 #include <utility>
10 10
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 StartUnlockAnimationBeforeUIDestroyed(callback); 181 StartUnlockAnimationBeforeUIDestroyed(callback);
182 } 182 }
183 183
184 void LockStateController::SetLockScreenDisplayedCallback( 184 void LockStateController::SetLockScreenDisplayedCallback(
185 const base::Closure& callback) { 185 const base::Closure& callback) {
186 lock_screen_displayed_callback_ = callback; 186 lock_screen_displayed_callback_ = callback;
187 } 187 }
188 188
189 void LockStateController::OnHostCloseRequested( 189 void LockStateController::OnHostCloseRequested(
190 const aura::WindowTreeHost* host) { 190 const aura::WindowTreeHost* host) {
191 WmShell::Get()->delegate()->Exit(); 191 Shell::Get()->shell_delegate()->Exit();
192 } 192 }
193 193
194 void LockStateController::OnLoginStateChanged(LoginStatus status) { 194 void LockStateController::OnLoginStateChanged(LoginStatus status) {
195 if (status != LoginStatus::LOCKED) 195 if (status != LoginStatus::LOCKED)
196 login_status_ = status; 196 login_status_ = status;
197 system_is_locked_ = (status == LoginStatus::LOCKED); 197 system_is_locked_ = (status == LoginStatus::LOCKED);
198 } 198 }
199 199
200 void LockStateController::OnAppTerminating() { 200 void LockStateController::OnAppTerminating() {
201 // If we hear that Chrome is exiting but didn't request it ourselves, all we 201 // If we hear that Chrome is exiting but didn't request it ourselves, all we
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 SessionStateAnimator::AnimationSpeed speed, 559 SessionStateAnimator::AnimationSpeed speed,
560 SessionStateAnimator::AnimationSequence* animation_sequence) { 560 SessionStateAnimator::AnimationSequence* animation_sequence) {
561 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { 561 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) {
562 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, 562 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER,
563 SessionStateAnimator::ANIMATION_FADE_OUT, 563 SessionStateAnimator::ANIMATION_FADE_OUT,
564 speed); 564 speed);
565 } 565 }
566 } 566 }
567 567
568 } // namespace ash 568 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/tablet_power_button_controller_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