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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_win.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_delegate_win.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_win.cc b/chrome/browser/ui/ash/system_tray_delegate_win.cc
index 041970c2c0f6eba4b186772098889ad548b66607..0dbaa63fb8022abbda81fa5ebfc80b3d9f187e33 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_win.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_win.cc
@@ -72,16 +72,15 @@ class SystemTrayDelegateWin : public ash::SystemTrayDelegate,
return base::string16();
}
- virtual const std::string GetLocallyManagedUserManager() const OVERRIDE {
+ virtual const std::string GetSupervisedUserManager() const OVERRIDE {
return std::string();
}
- virtual const base::string16 GetLocallyManagedUserManagerName() const
- OVERRIDE {
+ virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE {
return base::string16();
}
- virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE {
+ virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE {
return base::string16();
}
@@ -144,7 +143,7 @@ class SystemTrayDelegateWin : public ash::SystemTrayDelegate,
virtual void ShowPublicAccountInfo() OVERRIDE {
}
- virtual void ShowLocallyManagedUserInfo() OVERRIDE {
+ virtual void ShowSupervisedUserInfo() OVERRIDE {
}
virtual void ShowEnterpriseInfo() OVERRIDE {
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_linux.cc ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698