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 /chrome/browser/chromeos | |
| 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 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/system/ash_system_tray_delegate.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc index 764b81e..7a8a0fa 100644 --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc @@ -463,8 +463,9 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE { if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED) return string16(); - return l10n_util::GetStringFUTF16(IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE, - GetLocallyManagedUserManagerName()); + return l10n_util::GetStringFUTF16( + IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE, + UTF8ToUTF16(GetLocallyManagedUserManager())); } virtual bool SystemShouldUpgrade() const OVERRIDE { |