diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-08 11:19:31 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-08 11:19:31 +0000 |
| commit | 3aacc9c9ec7d8c3124c8263d0f70bcf3c2cb2866 (patch) | |
| tree | 1811f72cf9c76619933d419399b49ff8519a4821 /ash/system | |
| parent | df32e3e8f38c0becf92773ca4da8f568175f9376 (diff) | |
| download | chromium_src-3aacc9c9ec7d8c3124c8263d0f70bcf3c2cb2866.zip chromium_src-3aacc9c9ec7d8c3124c8263d0f70bcf3c2cb2866.tar.gz chromium_src-3aacc9c9ec7d8c3124c8263d0f70bcf3c2cb2866.tar.bz2 | |
[cros] Various fixes for Chrome OS supervised user UI
* Creation flow > intro screen content updated
* String: [Creating profile...] > [Creating supervised user]
* String [Authenticating...] > [Authenticating]
* String: [Create an name] > [Create a name]
* First-run notification/tray info string
* User manager display email preserves dots.
* Manager email is shown on blocked info page
BUG=267002,267846,268788,268938,265548,268988,269150,268982,268271
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/22144003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/tray/system_tray_delegate.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index 45b0c71..6c76b57 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h @@ -136,10 +136,11 @@ class SystemTrayDelegate { // Returns notification for enterprise enrolled devices. virtual const base::string16 GetEnterpriseMessage() const = 0; - // Returns the email of user that manages current locally managed user. + // Returns the display 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. + // Returns the name of user that manages current locally managed user. virtual const base::string16 GetLocallyManagedUserManagerName() const = 0; // Returns notification for locally managed users. |