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

Side by Side Diff: chrome/browser/chromeos/power/power_button_observer.cc

Issue 15974008: Rename SessionStateController -> LockStateController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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 #include "chrome/browser/chromeos/power/power_button_observer.h" 5 #include "chrome/browser/chromeos/power/power_button_observer.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/system/user/login_status.h" 9 #include "ash/system/user/login_status.h"
10 #include "ash/wm/power_button_controller.h" 10 #include "ash/wm/power_button_controller.h"
(...skipping 11 matching lines...) Expand all
22 ash::user::LoginStatus GetCurrentLoginStatus() { 22 ash::user::LoginStatus GetCurrentLoginStatus() {
23 if (!ash::Shell::GetInstance()->system_tray_delegate()) 23 if (!ash::Shell::GetInstance()->system_tray_delegate())
24 return ash::user::LOGGED_IN_NONE; 24 return ash::user::LOGGED_IN_NONE;
25 return ash::Shell::GetInstance()->system_tray_delegate()-> 25 return ash::Shell::GetInstance()->system_tray_delegate()->
26 GetUserLoginStatus(); 26 GetUserLoginStatus();
27 } 27 }
28 28
29 } // namespace 29 } // namespace
30 30
31 PowerButtonObserver::PowerButtonObserver() { 31 PowerButtonObserver::PowerButtonObserver() {
32 ash::Shell::GetInstance()->session_state_controller()-> 32 ash::Shell::GetInstance()->lock_state_controller()->
33 SetDelegate(new SessionStateControllerDelegateChromeos); 33 SetDelegate(new SessionStateControllerDelegateChromeos);
34 34
35 registrar_.Add( 35 registrar_.Add(
36 this, 36 this,
37 chrome::NOTIFICATION_LOGIN_USER_CHANGED, 37 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
38 content::NotificationService::AllSources()); 38 content::NotificationService::AllSources());
39 registrar_.Add( 39 registrar_.Add(
40 this, 40 this,
41 chrome::NOTIFICATION_APP_TERMINATING, 41 chrome::NOTIFICATION_APP_TERMINATING,
42 content::NotificationService::AllSources()); 42 content::NotificationService::AllSources());
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 82 }
83 } 83 }
84 84
85 void PowerButtonObserver::PowerButtonEventReceived( 85 void PowerButtonObserver::PowerButtonEventReceived(
86 bool down, const base::TimeTicks& timestamp) { 86 bool down, const base::TimeTicks& timestamp) {
87 ash::Shell::GetInstance()->power_button_controller()-> 87 ash::Shell::GetInstance()->power_button_controller()->
88 OnPowerButtonEvent(down, timestamp); 88 OnPowerButtonEvent(down, timestamp);
89 } 89 }
90 90
91 void PowerButtonObserver::LockScreen() { 91 void PowerButtonObserver::LockScreen() {
92 ash::Shell::GetInstance()->session_state_controller()->OnStartingLock(); 92 ash::Shell::GetInstance()->lock_state_controller()->OnStartingLock();
93 } 93 }
94 94
95 } // namespace chromeos 95 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698