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

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

Issue 326813004: Added quick lock mechanism while in Touchview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added ASH_EXPORT to SessionStateAnimator Created 6 years, 3 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/session_state_animator_impl.cc ('k') | no next file » | 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 #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"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 13 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
14 #include "chrome/browser/chromeos/power/session_state_controller_delegate_chrome os.h" 14 #include "chrome/browser/chromeos/power/session_state_controller_delegate_chrome os.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
17 17
18 namespace ash {
19 class LockStateControllerDelegate;
20 }
21
18 namespace chromeos { 22 namespace chromeos {
19 23
20 namespace { 24 namespace {
21 25
22 ash::user::LoginStatus GetCurrentLoginStatus() { 26 ash::user::LoginStatus GetCurrentLoginStatus() {
23 if (!ash::Shell::GetInstance()->system_tray_delegate()) 27 if (!ash::Shell::GetInstance()->system_tray_delegate())
24 return ash::user::LOGGED_IN_NONE; 28 return ash::user::LOGGED_IN_NONE;
25 return ash::Shell::GetInstance()->system_tray_delegate()-> 29 return ash::Shell::GetInstance()->system_tray_delegate()->
26 GetUserLoginStatus(); 30 GetUserLoginStatus();
27 } 31 }
28 32
29 } // namespace 33 } // namespace
30 34
31 PowerButtonObserver::PowerButtonObserver() { 35 PowerButtonObserver::PowerButtonObserver() {
32 ash::Shell::GetInstance()->lock_state_controller()-> 36 ash::Shell::GetInstance()->lock_state_controller()->
33 SetDelegate(new SessionStateControllerDelegateChromeos); 37 SetDelegate(scoped_ptr<ash::LockStateControllerDelegate>(
38 new SessionStateControllerDelegateChromeos));
34 39
35 registrar_.Add( 40 registrar_.Add(
36 this, 41 this,
37 chrome::NOTIFICATION_LOGIN_USER_CHANGED, 42 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
38 content::NotificationService::AllSources()); 43 content::NotificationService::AllSources());
39 registrar_.Add( 44 registrar_.Add(
40 this, 45 this,
41 chrome::NOTIFICATION_APP_TERMINATING, 46 chrome::NOTIFICATION_APP_TERMINATING,
42 content::NotificationService::AllSources()); 47 content::NotificationService::AllSources());
43 registrar_.Add( 48 registrar_.Add(
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 87 }
83 } 88 }
84 89
85 void PowerButtonObserver::PowerButtonEventReceived( 90 void PowerButtonObserver::PowerButtonEventReceived(
86 bool down, const base::TimeTicks& timestamp) { 91 bool down, const base::TimeTicks& timestamp) {
87 ash::Shell::GetInstance()->power_button_controller()-> 92 ash::Shell::GetInstance()->power_button_controller()->
88 OnPowerButtonEvent(down, timestamp); 93 OnPowerButtonEvent(down, timestamp);
89 } 94 }
90 95
91 } // namespace chromeos 96 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/session_state_animator_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698