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

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

Issue 2252823002: Updates to Ash material design icons used for TrayImageItem (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/common/login_status.h" 9 #include "ash/common/login_status.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return LoginStatus::LOCKED; 84 return LoginStatus::LOCKED;
85 return login_status_; 85 return login_status_;
86 } 86 }
87 87
88 bool TestSystemTrayDelegate::IsUserSupervised() const { 88 bool TestSystemTrayDelegate::IsUserSupervised() const {
89 return login_status_ == LoginStatus::SUPERVISED; 89 return login_status_ == LoginStatus::SUPERVISED;
90 } 90 }
91 91
92 void TestSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { 92 void TestSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
93 DCHECK(info); 93 DCHECK(info);
94 info->severity = UpdateInfo::UPDATE_NORMAL; 94 info->severity = UpdateInfo::UPDATE_NONE;
95 info->update_required = g_system_update_required; 95 info->update_required = g_system_update_required;
96 info->factory_reset_required = false; 96 info->factory_reset_required = false;
97 } 97 }
98 98
99 bool TestSystemTrayDelegate::ShouldShowDisplayNotification() { 99 bool TestSystemTrayDelegate::ShouldShowDisplayNotification() {
100 return should_show_display_notification_; 100 return should_show_display_notification_;
101 } 101 }
102 102
103 bool TestSystemTrayDelegate::GetSessionStartTime( 103 bool TestSystemTrayDelegate::GetSessionStartTime(
104 base::TimeTicks* session_start_time) { 104 base::TimeTicks* session_start_time) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 return nullptr; 137 return nullptr;
138 #endif 138 #endif
139 } 139 }
140 140
141 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) { 141 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) {
142 *info = current_ime_; 142 *info = current_ime_;
143 } 143 }
144 144
145 } // namespace test 145 } // namespace test
146 } // namespace ash 146 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698