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

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

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 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
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 { 18 namespace ash {
19 class LockStateControllerDelegate; 19 class LockStateControllerDelegate;
20 } 20 }
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 namespace { 24 namespace {
25 25
26 ash::user::LoginStatus GetCurrentLoginStatus() { 26 ash::LoginStatus GetCurrentLoginStatus() {
27 if (!ash::Shell::GetInstance()->system_tray_delegate()) 27 if (!ash::Shell::GetInstance()->system_tray_delegate())
28 return ash::user::LOGGED_IN_NONE; 28 return ash::LoginStatus::NOT_LOGGED_IN;
29 return ash::Shell::GetInstance()->system_tray_delegate()-> 29 return ash::Shell::GetInstance()->system_tray_delegate()->
30 GetUserLoginStatus(); 30 GetUserLoginStatus();
31 } 31 }
32 32
33 } // namespace 33 } // namespace
34 34
35 PowerButtonObserver::PowerButtonObserver() { 35 PowerButtonObserver::PowerButtonObserver() {
36 // TODO: Remove after resolving crbug.com/452599. 36 // TODO: Remove after resolving crbug.com/452599.
37 VLOG(0) << "Creating PowerButtonObserver " << this; 37 VLOG(0) << "Creating PowerButtonObserver " << this;
38 38
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 96 }
97 } 97 }
98 98
99 void PowerButtonObserver::PowerButtonEventReceived( 99 void PowerButtonObserver::PowerButtonEventReceived(
100 bool down, const base::TimeTicks& timestamp) { 100 bool down, const base::TimeTicks& timestamp) {
101 ash::Shell::GetInstance()->power_button_controller()-> 101 ash::Shell::GetInstance()->power_button_controller()->
102 OnPowerButtonEvent(down, timestamp); 102 OnPowerButtonEvent(down, timestamp);
103 } 103 }
104 104
105 } // namespace chromeos 105 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698