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

Side by Side Diff: ash/system/tray/default_system_tray_delegate.cc

Issue 627593003: Adding infrastructure for possibility of changing manager names for the supervised accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Default system tray extended for proper tests support. Created 6 years, 2 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/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | 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/system/tray/default_system_tray_delegate.h" 5 #include "ash/system/tray/default_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 const std::string DefaultSystemTrayDelegate::GetEnterpriseDomain() const { 65 const std::string DefaultSystemTrayDelegate::GetEnterpriseDomain() const {
66 return std::string(); 66 return std::string();
67 } 67 }
68 68
69 const base::string16 DefaultSystemTrayDelegate::GetEnterpriseMessage() const { 69 const base::string16 DefaultSystemTrayDelegate::GetEnterpriseMessage() const {
70 return base::string16(); 70 return base::string16();
71 } 71 }
72 72
73 const std::string 73 const std::string
74 DefaultSystemTrayDelegate::GetSupervisedUserManager() const { 74 DefaultSystemTrayDelegate::GetSupervisedUserManager() const {
75 return std::string(); 75 if (!IsUserSupervised())
76 return std::string();
77 return "manager@chrome.com";
76 } 78 }
77 79
78 const base::string16 80 const base::string16
79 DefaultSystemTrayDelegate::GetSupervisedUserManagerName() 81 DefaultSystemTrayDelegate::GetSupervisedUserManagerName()
80 const { 82 const {
81 return base::string16(); 83 return base::string16();
82 } 84 }
83 85
84 const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage() 86 const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage()
85 const { 87 const {
86 return base::string16(); 88 return base::string16();
87 } 89 }
88 90
89 bool DefaultSystemTrayDelegate::IsUserSupervised() const { 91 bool DefaultSystemTrayDelegate::IsUserSupervised() const {
90 return false; 92 return GetUserLoginStatus() == ash::user::LOGGED_IN_SUPERVISED;
91 } 93 }
92 94
93 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { 95 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
94 DCHECK(info); 96 DCHECK(info);
95 info->severity = UpdateInfo::UPDATE_NORMAL; 97 info->severity = UpdateInfo::UPDATE_NORMAL;
96 info->update_required = true; 98 info->update_required = true;
97 info->factory_reset_required = false; 99 info->factory_reset_required = false;
98 } 100 }
99 101
100 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const { 102 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 286
285 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { 287 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
286 return false; 288 return false;
287 } 289 }
288 290
289 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( 291 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate(
290 const std::string& user_id) { 292 const std::string& user_id) {
291 return NULL; 293 return NULL;
292 } 294 }
293 295
296 void DefaultSystemTrayDelegate::AddCustodianInfoTrayObserver(
297 CustodianInfoTrayObserver* observer) {
298 }
299
300 void DefaultSystemTrayDelegate::RemoveCustodianInfoTrayObserver(
301 CustodianInfoTrayObserver* observer) {
302 }
303
294 } // namespace ash 304 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698