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

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

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray.cc » ('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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
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::GetLocallyManagedUserManager() const { 74 DefaultSystemTrayDelegate::GetSupervisedUserManager() const {
75 return std::string(); 75 return std::string();
76 } 76 }
77 77
78 const base::string16 78 const base::string16
79 DefaultSystemTrayDelegate::GetLocallyManagedUserManagerName() 79 DefaultSystemTrayDelegate::GetSupervisedUserManagerName()
80 const { 80 const {
81 return base::string16(); 81 return base::string16();
82 } 82 }
83 83
84 const base::string16 DefaultSystemTrayDelegate::GetLocallyManagedUserMessage() 84 const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage()
85 const { 85 const {
86 return base::string16(); 86 return base::string16();
87 } 87 }
88 88
89 bool DefaultSystemTrayDelegate::SystemShouldUpgrade() const { 89 bool DefaultSystemTrayDelegate::SystemShouldUpgrade() const {
90 return true; 90 return true;
91 } 91 }
92 92
93 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const { 93 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const {
94 return base::k24HourClock; 94 return base::k24HourClock;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 void DefaultSystemTrayDelegate::ShowAccessibilitySettings() { 139 void DefaultSystemTrayDelegate::ShowAccessibilitySettings() {
140 } 140 }
141 141
142 void DefaultSystemTrayDelegate::ShowPublicAccountInfo() { 142 void DefaultSystemTrayDelegate::ShowPublicAccountInfo() {
143 } 143 }
144 144
145 void DefaultSystemTrayDelegate::ShowEnterpriseInfo() { 145 void DefaultSystemTrayDelegate::ShowEnterpriseInfo() {
146 } 146 }
147 147
148 void DefaultSystemTrayDelegate::ShowLocallyManagedUserInfo() { 148 void DefaultSystemTrayDelegate::ShowSupervisedUserInfo() {
149 } 149 }
150 150
151 void DefaultSystemTrayDelegate::ShowUserLogin() { 151 void DefaultSystemTrayDelegate::ShowUserLogin() {
152 } 152 }
153 153
154 bool DefaultSystemTrayDelegate::ShowSpringChargerReplacementDialog() { 154 bool DefaultSystemTrayDelegate::ShowSpringChargerReplacementDialog() {
155 return false; 155 return false;
156 } 156 }
157 157
158 bool DefaultSystemTrayDelegate::IsSpringChargerReplacementDialogVisible() { 158 bool DefaultSystemTrayDelegate::IsSpringChargerReplacementDialogVisible() {
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { 290 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
291 return false; 291 return false;
292 } 292 }
293 293
294 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( 294 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate(
295 const std::string& user_id) { 295 const std::string& user_id) {
296 return NULL; 296 return NULL;
297 } 297 }
298 298
299 } // namespace ash 299 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698