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

Side by Side Diff: ash/test/test_system_tray_delegate.cc

Issue 2826313002: cros: Use SessionController in UserMetricsRecorder to get login status (Closed)
Patch Set: review comments Created 3 years, 8 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/test/test_system_tray_delegate.h ('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 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/test/test_system_tray_delegate.h" 5 #include "ash/test/test_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/login_status.h" 9 #include "ash/login_status.h"
10 #include "ash/session/session_controller.h" 10 #include "ash/session/session_controller.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace test { 15 namespace test {
16 16
17 TestSystemTrayDelegate::TestSystemTrayDelegate() 17 TestSystemTrayDelegate::TestSystemTrayDelegate() = default;
18 : login_status_(LoginStatus::USER), session_length_limit_set_(false) {}
19 18
20 TestSystemTrayDelegate::~TestSystemTrayDelegate() {} 19 TestSystemTrayDelegate::~TestSystemTrayDelegate() = default;
21
22 void TestSystemTrayDelegate::SetLoginStatus(LoginStatus login_status) {
23 login_status_ = login_status;
24 Shell::Get()->UpdateAfterLoginStatusChange(login_status);
25 }
26 20
27 void TestSystemTrayDelegate::SetSessionLengthLimitForTest( 21 void TestSystemTrayDelegate::SetSessionLengthLimitForTest(
28 const base::TimeDelta& new_limit) { 22 const base::TimeDelta& new_limit) {
29 session_length_limit_ = new_limit; 23 session_length_limit_ = new_limit;
30 session_length_limit_set_ = true; 24 session_length_limit_set_ = true;
31 } 25 }
32 26
33 void TestSystemTrayDelegate::ClearSessionLengthLimit() { 27 void TestSystemTrayDelegate::ClearSessionLengthLimit() {
34 session_length_limit_set_ = false; 28 session_length_limit_set_ = false;
35 } 29 }
36 30
37 void TestSystemTrayDelegate::SetCurrentIME(const IMEInfo& info) { 31 void TestSystemTrayDelegate::SetCurrentIME(const IMEInfo& info) {
38 current_ime_ = info; 32 current_ime_ = info;
39 } 33 }
40 34
41 void TestSystemTrayDelegate::SetAvailableIMEList(const IMEInfoList& list) { 35 void TestSystemTrayDelegate::SetAvailableIMEList(const IMEInfoList& list) {
42 ime_list_ = list; 36 ime_list_ = list;
43 } 37 }
44 38
45 LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const { 39 LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
46 // At new user image screen manager->IsUserLoggedIn() would return true 40 return Shell::Get()->session_controller()->login_status();
47 // but there's no browser session available yet so use SessionStarted().
48 SessionController* controller = Shell::Get()->session_controller();
49
50 if (!controller->IsActiveUserSessionStarted())
51 return LoginStatus::NOT_LOGGED_IN;
52 if (controller->IsScreenLocked())
53 return LoginStatus::LOCKED;
54 return login_status_;
55 } 41 }
56 42
57 std::string TestSystemTrayDelegate::GetSupervisedUserManager() const { 43 std::string TestSystemTrayDelegate::GetSupervisedUserManager() const {
58 if (!Shell::Get()->session_controller()->IsUserSupervised()) 44 if (!Shell::Get()->session_controller()->IsUserSupervised())
59 return std::string(); 45 return std::string();
60 return "manager@chrome.com"; 46 return "manager@chrome.com";
61 } 47 }
62 48
63 bool TestSystemTrayDelegate::GetSessionStartTime( 49 bool TestSystemTrayDelegate::GetSessionStartTime(
64 base::TimeTicks* session_start_time) { 50 base::TimeTicks* session_start_time) {
(...skipping 14 matching lines...) Expand all
79 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) { 65 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) {
80 *info = current_ime_; 66 *info = current_ime_;
81 } 67 }
82 68
83 void TestSystemTrayDelegate::GetAvailableIMEList(IMEInfoList* list) { 69 void TestSystemTrayDelegate::GetAvailableIMEList(IMEInfoList* list) {
84 *list = ime_list_; 70 *list = ime_list_;
85 } 71 }
86 72
87 } // namespace test 73 } // namespace test
88 } // namespace ash 74 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_system_tray_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698