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

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

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: update PaletteTray to exclude ARC kiosk Created 3 years, 7 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/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"
10 #include "ash/session/session_controller.h"
11 #include "ash/shell.h" 9 #include "ash/shell.h"
12 #include "base/time/time.h" 10 #include "base/time/time.h"
13 11
14 namespace ash { 12 namespace ash {
15 namespace test { 13 namespace test {
16 14
17 TestSystemTrayDelegate::TestSystemTrayDelegate() = default; 15 TestSystemTrayDelegate::TestSystemTrayDelegate() = default;
18 16
19 TestSystemTrayDelegate::~TestSystemTrayDelegate() = default; 17 TestSystemTrayDelegate::~TestSystemTrayDelegate() = default;
20 18
21 void TestSystemTrayDelegate::SetSessionLengthLimitForTest( 19 void TestSystemTrayDelegate::SetSessionLengthLimitForTest(
22 const base::TimeDelta& new_limit) { 20 const base::TimeDelta& new_limit) {
23 session_length_limit_ = new_limit; 21 session_length_limit_ = new_limit;
24 session_length_limit_set_ = true; 22 session_length_limit_set_ = true;
25 } 23 }
26 24
27 void TestSystemTrayDelegate::ClearSessionLengthLimit() { 25 void TestSystemTrayDelegate::ClearSessionLengthLimit() {
28 session_length_limit_set_ = false; 26 session_length_limit_set_ = false;
29 } 27 }
30 28
31 void TestSystemTrayDelegate::SetCurrentIME(const IMEInfo& info) { 29 void TestSystemTrayDelegate::SetCurrentIME(const IMEInfo& info) {
32 current_ime_ = info; 30 current_ime_ = info;
33 } 31 }
34 32
35 void TestSystemTrayDelegate::SetAvailableIMEList(const IMEInfoList& list) { 33 void TestSystemTrayDelegate::SetAvailableIMEList(const IMEInfoList& list) {
36 ime_list_ = list; 34 ime_list_ = list;
37 } 35 }
38 36
39 LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
40 return Shell::Get()->session_controller()->login_status();
41 }
42
43 bool TestSystemTrayDelegate::GetSessionStartTime( 37 bool TestSystemTrayDelegate::GetSessionStartTime(
44 base::TimeTicks* session_start_time) { 38 base::TimeTicks* session_start_time) {
45 // Just returns TimeTicks::Now(), so the remaining time is always the 39 // Just returns TimeTicks::Now(), so the remaining time is always the
46 // specified limit. This is useful for testing. 40 // specified limit. This is useful for testing.
47 if (session_length_limit_set_) 41 if (session_length_limit_set_)
48 *session_start_time = base::TimeTicks::Now(); 42 *session_start_time = base::TimeTicks::Now();
49 return session_length_limit_set_; 43 return session_length_limit_set_;
50 } 44 }
51 45
52 bool TestSystemTrayDelegate::GetSessionLengthLimit( 46 bool TestSystemTrayDelegate::GetSessionLengthLimit(
53 base::TimeDelta* session_length_limit) { 47 base::TimeDelta* session_length_limit) {
54 if (session_length_limit_set_) 48 if (session_length_limit_set_)
55 *session_length_limit = session_length_limit_; 49 *session_length_limit = session_length_limit_;
56 return session_length_limit_set_; 50 return session_length_limit_set_;
57 } 51 }
58 52
59 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) { 53 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) {
60 *info = current_ime_; 54 *info = current_ime_;
61 } 55 }
62 56
63 void TestSystemTrayDelegate::GetAvailableIMEList(IMEInfoList* list) { 57 void TestSystemTrayDelegate::GetAvailableIMEList(IMEInfoList* list) {
64 *list = ime_list_; 58 *list = ime_list_;
65 } 59 }
66 60
67 } // namespace test 61 } // namespace test
68 } // namespace ash 62 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_system_tray_delegate.h ('k') | ash/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698