diff options
author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 16:19:20 +0000 |
---|---|---|
committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 16:19:20 +0000 |
commit | 52df839b3b1b1746c3a3ae21e59947d411aafee9 (patch) | |
tree | 5925b21fafabca71d68a146e7038495ad6dab924 /ash | |
parent | 140930a3e07ed13228a32f414c78899901381c41 (diff) | |
download | chromium_src-52df839b3b1b1746c3a3ae21e59947d411aafee9.zip chromium_src-52df839b3b1b1746c3a3ae21e59947d411aafee9.tar.gz chromium_src-52df839b3b1b1746c3a3ae21e59947d411aafee9.tar.bz2 |
Update Managed user strings for ChromeOS
BUG=179669
R=ygorshenin@chromium.org
TBR=derat@chromium.org
notry=TRUE
Review URL: https://chromiumcodereview.appspot.com/17494004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r-- | ash/system/tray/system_tray_delegate.h | 3 | ||||
-rw-r--r-- | ash/system/tray/test_system_tray_delegate.cc | 5 | ||||
-rw-r--r-- | ash/system/tray/test_system_tray_delegate.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index 847ff8c..191d481 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h @@ -139,6 +139,9 @@ class SystemTrayDelegate { // Returns the email of user that manages current locally managed user. virtual const std::string GetLocallyManagedUserManager() const = 0; + // Returns the email of user that manages current locally managed user. + virtual const base::string16 GetLocallyManagedUserManagerName() const = 0; + // Returns notification for locally managed users. virtual const base::string16 GetLocallyManagedUserMessage() const = 0; diff --git a/ash/system/tray/test_system_tray_delegate.cc b/ash/system/tray/test_system_tray_delegate.cc index c2eb2df..3092287 100644 --- a/ash/system/tray/test_system_tray_delegate.cc +++ b/ash/system/tray/test_system_tray_delegate.cc @@ -104,6 +104,11 @@ const std::string TestSystemTrayDelegate::GetLocallyManagedUserManager() const { return std::string(); } +const base::string16 TestSystemTrayDelegate::GetLocallyManagedUserManagerName() + const { + return string16(); +} + const base::string16 TestSystemTrayDelegate::GetLocallyManagedUserMessage() const { return string16(); diff --git a/ash/system/tray/test_system_tray_delegate.h b/ash/system/tray/test_system_tray_delegate.h index 27ee734..fa6b53c 100644 --- a/ash/system/tray/test_system_tray_delegate.h +++ b/ash/system/tray/test_system_tray_delegate.h @@ -32,6 +32,8 @@ class TestSystemTrayDelegate : public SystemTrayDelegate { virtual const std::string GetEnterpriseDomain() const OVERRIDE; virtual const base::string16 GetEnterpriseMessage() const OVERRIDE; virtual const std::string GetLocallyManagedUserManager() const OVERRIDE; + virtual const base::string16 GetLocallyManagedUserManagerName() const + OVERRIDE; virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE; virtual bool SystemShouldUpgrade() const OVERRIDE; virtual base::HourClockType GetHourClockType() const OVERRIDE; |