diff options
11 files changed, 133 insertions, 94 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; diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp index b934de0..9c2a9f9 100644 --- a/chrome/app/chromeos_strings.grdp +++ b/chrome/app/chromeos_strings.grdp @@ -462,166 +462,174 @@ Press any key to continue exploring. <message name="IDS_BROWSE_WITHOUT_SIGNING_IN_HTML" desc="Text shown on side of Google sign-in UI."> You may also skip signing in and <ph name="LINK_START">$1<ex>>a<</ex></ph>browse as Guest<ph name="LINK_END">$2<ex>>/a<</ex></ph>. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME" desc="Title close to icon shown on side of Google sign-in UI to create a locally managed user."> - Locally managed user + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME" desc="Title close to icon shown on side of Google sign-in UI to create a supervised user."> + Supervised user </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_1" desc="Managed user dialog, intro page, first paragraph"> - Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum. - As a manager of a managed user on this Chromebook, you can: - </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_1" desc="Managed user dialog, intro page, options available to manager"> - Review the limited user’s visited websites + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_HTML" desc="Text with actual link shown on side of Google sign-in UI to create a supervised user."> + <ph name="LINK_START">$1<ex>>a<</ex></ph>Create a supervised user<ph name="LINK_END">$2<ex>>/a<</ex></ph> for this device. + </message> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT" desc="Text shown when supervised user can be created, but no users that can be manager exist."> + At least one account must exist on this device before creating a supervised user. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_2" desc="Managed user dialog, intro page, options available to manager"> - Determine sites you wish to allow or restrict, and + <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_1" desc="Supervised user dialog, intro page, first paragraph"> + A supervised user can explore the web with your guidance. As the manager of a supervised user in Chrome, you can: </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_3" desc="Managed user dialog, intro page, options available to manager"> - Manage other settings + <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_1" desc="Supervised user dialog, intro page, options available to manager"> + allow or prohibit certain websites, </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_2" desc="Managed user dialog, intro page, second paragraph"> - A managed user is not a Google account, and applies only to this device. + <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_2" desc="Supervised user dialog, intro page, options available to manager"> + review websites the supervised user has visited, and </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_3" desc="Managed user dialog, intro page, third paragraph"> - After you create a new locally managed users, you can manage the settings at any time from any device at <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>. + <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_3" desc="Supervised user dialog, intro page, options available to manager"> + manage other settings </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_TITLE" desc="Managed user dialog, manager selection page, title of the page"> - Choose the manager for this user + <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_2" desc="Supervised user dialog, intro page, second paragraph"> + Creating a supervised user does not create a Google Account, and their settings + and data will not follow them to other devices with Chrome Sync. Currently, + a supervised user applies only to this installation of Chrome, on this device. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_EXPLANATION" desc="Managed user dialog, manager selection page, explanation of the page"> - The manager will be able to configure restrictions and settings for this managed user at <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>. + <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_3" desc="Supervised user dialog, intro page, third paragraph"> + After you create a new supervised user, you can manage the settings at any time from any device at <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_MANAGER_PASSWORD_HINT" desc="Managed user dialog, manager selection page, text shown as a hint in the user password field."> - Enter password + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_TITLE" desc="Supervised user dialog, manager selection page, title of the page"> + Choose the manager for this supervised user </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT" desc="Text shown when managed user can be created, but no users that can be manager exist."> - At least one account must exist on this device before creating a Locally managed user. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_EXPLANATION" desc="Supervised user dialog, manager selection page, explanation of the page"> + The manager will be able to configure restrictions and settings for this supervised user at <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_HTML" desc="Text with actual name shown on side of Google sign-in UI to create a locally managed user."> - <ph name="LINK_START">$1<ex>>a<</ex></ph>Create managed user<ph name="LINK_END">$2<ex>>/a<</ex></ph> for this device. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_MANAGER_PASSWORD_HINT" desc="Supervised user dialog, manager selection page, text shown as a hint in the user password field."> + Enter password </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_TITLE" desc="Managed user dialog, new user page, title for name of new user"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_TITLE" desc="Supervised user dialog, new user page, title for name of new user"> Create an name - </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_EXPLANATION" desc="Managed user dialog, new user page, explanation for name of new user"> - This account will be managed by <ph name="MANAGER_EMAIL">$1<ex>john.doe@example.com</ex></ph>. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_EXPLANATION" desc="Supervised user dialog, new user page, explanation for name of new user"> + This supervised user will be managed by <ph name="MANAGER_EMAIL">$1<ex>john.doe@example.com</ex></ph>. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TITLE" desc="Managed user dialog, new user page, title for password for new user."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TITLE" desc="Supervised user dialog, new user page, title for password for new user."> Create a password - </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_EXPLANATION" desc="Managed user dialog, new user page, explanation for password for new user."> - The managed user will need to use this password to sign in, so choose a safe password and rememeber to discuss it with the managed user. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_EXPLANATION" desc="Supervised user dialog, new user page, explanation for password for new user."> + The supervised user will need to use this password to sign in, so choose a safe password and remember to discuss it with the supervised user. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_HINT" desc="Text shown as a hint in the password field in locally managed user creation dialog."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_HINT" desc="Text shown as a hint in the password field in supervised user creation dialog."> Enter password </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_CONFIRM_HINT" desc="Text shown as a hint in the password confirmation field in locally managed user creation dialog."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_CONFIRM_HINT" desc="Text shown as a hint in the password confirmation field in supervised user creation dialog."> Confirm password </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_CONTINUE_BUTTON_TEXT" desc="Text shown on continue button in locally managed user creation dialog."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_CONTINUE_BUTTON_TEXT" desc="Text shown on continue button in supervised user creation dialog."> Continue </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_START_BUTTON_TEXT" desc="Text shown on start button in locally managed user creation dialog."> - Create locally managed user. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_START_BUTTON_TEXT" desc="Text shown on start button in supervised user creation dialog."> + Create supervised user. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_NEXT_BUTTON_TEXT" desc="Text shown on next button in locally managed user creation dialog."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_NEXT_BUTTON_TEXT" desc="Text shown on next button in supervised user creation dialog."> Next </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PREVIOUS_BUTTON_TEXT" desc="Text shown on previous button in locally managed user creation dialog."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PREVIOUS_BUTTON_TEXT" desc="Text shown on previous button in supervised user creation dialog."> Previous </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_1" desc="Managed user dialog, getting started page 1, paragraph 1"> - A mananged user named <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph> has been created. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_1" desc="Supervised user dialog, getting started page 1, paragraph 1"> + A supervised user named <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph> has been created. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_2" desc="Managed user dialog, getting started page 1, paragraph 2"> - This locally managed user can now sign in and browse all sites on web + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_2" desc="Supervised user dialog, getting started page 1, paragraph 2"> + To set which websites the supervised user can view, you can configure restrictions + and settings by visiting <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>. + If you do not change the default settings, <ph name="USER_DISPLAY_NAME">$2<ex>John</ex></ph> + can browse all sites on the web. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_3" desc="Managed user dialog, getting started page 1, paragraph 3"> - To configure restrictions for this locally managed user, please check your email at <ph name="BEGIN_BOLD"><strong></ph><ph name="MANAGER_EMAIL">$1<ex>john.doe@example.com</ex></ph><ph name="END_BOLD"></strong></ph> for further instructions. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_3" desc="Supervised user dialog, getting started page 1, paragraph 3"> + Please check your email at <ph name="BEGIN_BOLD"><strong></ph><ph name="MANAGER_EMAIL">$1<ex>john.doe@example.com</ex></ph><ph name="END_BOLD"></strong></ph> for further instructions. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_2_TEXT_1" desc="Managed user dialog, getting started page 2, paragraph 1"> - You will see the locally managed users on your Chromebook's sign-in screen. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_2_TEXT_1" desc="Supervised user dialog, getting started page 2, paragraph 1"> + You will see the supervised users on your Chromebook's sign-in screen. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_2_TEXT_2" desc="Managed user dialog, getting started page 2, paragraph 2"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_2_TEXT_2" desc="Supervised user dialog, getting started page 2, paragraph 2"> Lorem ipsum lorem ipsum lorem ipsum lorem ipsum. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_3_TEXT_1" desc="Managed user dialog, getting started page 3, paragraph 1"> - Manage your locally managed user's activity + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_3_TEXT_1" desc="Supervised user dialog, getting started page 3, paragraph 1"> + Manage your supervised user's activity </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_3_TEXT_2" desc="Managed user dialog, getting started page 3, paragraph 2"> - As a manager of this locally managed user, you can review the locally managed user's visited web sites, determine sites you wish to allow or restrict, and configure other settings + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_3_TEXT_2" desc="Supervised user dialog, getting started page 3, paragraph 2"> + As a manager of this supervised user, you can review the supervised user's visited web sites, determine sites you wish to allow or restrict, and configure other settings by visiting <ph name="BEGIN_BOLD"><strong></ph><ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph><ph name="END_BOLD"></strong></ph> and signing in as <ph name="BEGIN_BOLD"><strong></ph><ph name="MANAGER_EMAIL">$2<ex>john.doe@example.com</ex></ph><ph name="END_BOLD"></strong></ph>. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_3_TEXT_3" desc="Managed user dialog, getting started page 3, paragraph 3"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_3_TEXT_3" desc="Supervised user dialog, getting started page 3, paragraph 3"> For help, please check your email at <ph name="BEGIN_BOLD"><strong></ph><ph name="MANAGER_EMAIL">$1<ex>john.doe@example.com</ex></ph><ph name="END_BOLD"></strong></ph> for further instructions. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_GOT_IT_BUTTON_TITLE" desc="Text for button on a screen with successful locally managed user creation text"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_GOT_IT_BUTTON_TITLE" desc="Text for button on a screen with successful supervised user creation text"> Got it! </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_HANDLE_ERROR_BUTTON_TEXT" desc="Text for button on an error screen that closes locally managed user creation dialog"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_HANDLE_ERROR_BUTTON_TEXT" desc="Text for button on an error screen that closes supervised user creation dialog"> Okay </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS" desc="Error text shown in locally managed user creation dialog when local account with suggested name already exists on a device."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS" desc="Error text shown in supervised user creation dialog when local account with suggested name already exists on a device."> Whoops, this name is already in use! </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_MISMATCH_ERROR" desc="Error text shown in locally managed user creation dialog when typed passwords does not match."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_MISMATCH_ERROR" desc="Error text shown in supervised user creation dialog when typed passwords does not match."> Whoops, passwords do not match! </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT" desc="Error text shown in locally managed user creation dialog when typed password is too short."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT" desc="Error text shown in supervised user creation dialog when typed password is too short."> Password is too short. </message> <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_PASSWORD_ERROR" desc="Error text shown in locally managed user creation dialog when manager password is incorrect."> Incorrect password. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_TITLE" desc="Managed user dialog, error page, manager account is in inconsistent state, title"> - Something went wrong while signing in as manager. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_TITLE" desc="Supervised user dialog, error page, manager account is in inconsistent state, title"> + Oops, something went wrong </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE" desc="Managed user dialog, error page, manager account is in inconsistent state, text"> - Manager account is in inconsistent state. Please log in to manager account first and then try creating locally managed user again. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE" desc="Supervised user dialog, error page, manager account is in inconsistent state, text"> + To recover from this error, you will need to sign into your Google Account + from the sign-in screen. You can then sign out of your Google Account and + try creating a supervised user again. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_BUTTON" desc="Managed user dialog, error page, manager account is in inconsistent state, button title"> - Take me back to sign-in screen + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_BUTTON" desc="Supervised user dialog, error page, manager account is in inconsistent state, button title"> + OK, Take me back to sign-in screen </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_TITLE" desc="Managed user dialog, error page, tpm error during creation, title"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_TITLE" desc="Supervised user dialog, error page, tpm error during creation, title"> Oops, TPM error. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR" desc="Managed user dialog, error page, tpm error during creation, text"> - Something is wrong with device. Reboot an try again. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR" desc="Supervised user dialog, error page, tpm error during creation, text"> + Something is wrong with device. To recover from this error you will need to reboot device and try again. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_BUTTON" desc="Managed user dialog, error page, tpm error during creation, button title"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_BUTTON" desc="Supervised user dialog, error page, tpm error during creation, button title"> OK </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE" desc="Managed user dialog, error page, generic error during creation, title"> - Oops, something went wrong with creating a locally managed user. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE" desc="Supervised user dialog, error page, generic error during creation, title"> + Oops, something went wrong </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR" desc="Managed user dialog, error page, generic error during creation, text"> - Due to an error, a locally managed user was not created. Please try again later. + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR" desc="Supervised user dialog, error page, generic error during creation, text"> + Due to an error, a supervised user was not created. Please try again later. </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON" desc="Managed user dialog, error page, generic error during creation, button title"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON" desc="Supervised user dialog, error page, generic error during creation, button title"> OK </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_CANCEL_BUTTON_TITLE" desc="Text for button on an error reporting screen for locally managed user creation, that is used to abort whole operation"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_CANCEL_BUTTON_TITLE" desc="Text for button on an error reporting screen for supervised user creation, that is used to abort whole operation"> Cancel </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_RETRY_BUTTON_TITLE" desc="Text for button on an error reporting screen for locally managed user creation, that is used to retry failed operation"> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_RETRY_BUTTON_TITLE" desc="Text for button on an error reporting screen for supervised user creation, that is used to retry failed operation"> Retry </message> <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_AUTH_PROGRESS_MESSAGE" desc="Text shown next to progress indicator upon manager authentication."> Authenticating... </message> - <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_PROGRESS_MESSAGE" desc="Text shown next to progress indicator upon managed user creation."> + <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_PROGRESS_MESSAGE" desc="Text shown next to progress indicator upon supervised user creation."> Creating profile... </message> <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_TIMEOUT_MESSAGE" desc="Text shown at the place of progess indicator if creation takes too long and should be cancelled."> Profile takes too long to create. You may want to cancel process and retry later. </message> <message name="IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE" desc="Text for notifications showing that this user is locally managed"> - This user is managed by <ph name="MANAGER_EMAIL">$1<ex>john.doe@example.com</ex></ph>. Device usage and history may be tracked. + This supervised user is managed by <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph>. Usage and browsing history can be viewed by the manager. </message> - <message name="IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING" desc="Text shown as a warning when attempting to remove locally managed user."> - All files and local data will be permanently deleted once this managed user is removed. However, any synced history will still be viewable in the manager's settings for this user. + <message name="IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING" desc="Text shown as a warning when attempting to remove supervised user."> + All files and local data associated with the supervised user will be permanently + deleted once this supervised user is removed. Visited websites and settings + for this supervised user may still be visible by the manager at <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>. </message> - <message name="IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of locally managed user."> + <message name="IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of supervised user."> Remove this user </message> <message name="IDS_OFFLINE_LOGIN_HTML" desc="Text which suggests enter as an existing user when valid network isn't presented."> diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc index d17df61..3272275 100644 --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc @@ -464,12 +464,18 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, chromeos::UserManager::Get()->GetActiveUser()->email()); } + virtual const string16 GetLocallyManagedUserManagerName() const OVERRIDE { + if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED) + return string16(); + return UserManager::Get()->GetManagerDisplayNameForManagedUser( + chromeos::UserManager::Get()->GetActiveUser()->email()); + } + 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, - UTF8ToUTF16( - GetLocallyManagedUserManager())); + GetLocallyManagedUserManagerName()); } virtual bool SystemShouldUpgrade() const OVERRIDE { diff --git a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html index cdcadae..59dc9e7 100644 --- a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html +++ b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html @@ -68,7 +68,7 @@ <div> <div id="managed-user-creation-created-1-text-1" class="page-title centred"></div> - <div i18n-content="createManagedUserCreated1Text2" + <div id="managed-user-creation-created-1-text-2" class="page-title centred"></div> <div id="managed-user-creation-created-1-text-3" class="page-title-explanation centred"></div> diff --git a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js index 82a0fcd..9cba4c1 100644 --- a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js +++ b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js @@ -798,12 +798,15 @@ login.createScreen('LocallyManagedUserCreationScreen', this.updateElementText_('created-1-text-1', 'createManagedUserCreated1Text1', this.context_.managedName); + this.updateElementText_('created-1-text-2', + 'createManagedUserCreated1Text2', + loadTimeData.getString('managementURL'), this.context_.managedName); this.updateElementText_('created-1-text-3', 'createManagedUserCreated1Text3', managerId); this.updateElementText_('created-3-text-2', 'createManagedUserCreated3Text2', - loadTimeData.getStringF('managementURL'), + loadTimeData.getString('managementURL'), managerId); this.updateElementText_('created-3-text-3', 'createManagedUserCreated3Text3', @@ -813,9 +816,11 @@ login.createScreen('LocallyManagedUserCreationScreen', managerId); }, - updateElementText_: function(localId, templateName, value) { + updateElementText_: function(localId, templateName) { + var args = Array.prototype.slice.call(arguments); + args.shift(); this.getScreenElement(localId).innerHTML = - loadTimeData.getStringF(templateName, value); + loadTimeData.getStringF.apply(loadTimeData, args); }, showIntroPage: function() { diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc index e83226c..266e115 100644 --- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc @@ -12,6 +12,7 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" +#include "chrome/common/url_constants.h" #include "google_apis/gaia/gaia_auth_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -22,9 +23,6 @@ namespace { const char kLocallyManagedUserCreationScreen[] = "locally-managed-user-creation"; -const char kLocallyManagedWebURL[] = - "www.chrome.com/SomeTBDURL"; - } // namespace namespace chromeos { @@ -59,13 +57,13 @@ void LocallyManagedUserCreationScreenHandler::DeclareLocalizedValues( IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_2); builder->AddF("createManagedUserIntroText3", IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_3, - UTF8ToUTF16(kLocallyManagedWebURL)); + UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); builder->Add("createManagedUserPickManagerTitle", IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_TITLE); builder->AddF("createManagedUserPickManagerTitleExplanation", IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_EXPLANATION, - UTF8ToUTF16(kLocallyManagedWebURL)); + UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); builder->Add("createManagedUserManagerPasswordHint", IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_MANAGER_PASSWORD_HINT); builder->Add("createManagedUserWrongManagerPasswordText", @@ -115,7 +113,7 @@ void LocallyManagedUserCreationScreenHandler::DeclareLocalizedValues( builder->Add("createManagedUserCreated3Text3", IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_3_TEXT_3); - builder->Add("managementURL", kLocallyManagedWebURL); + builder->Add("managementURL", chrome::kSupervisedUserManagementDisplayURL); } void LocallyManagedUserCreationScreenHandler::Initialize() {} diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index e135e36..22030d2 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -434,8 +434,9 @@ void SigninScreenHandler::DeclareLocalizedValues( builder->Add("publicAccountEnter", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER); builder->Add("publicAccountEnterAccessibleName", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME); - builder->Add("removeManagedUserWarningText", - IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING); + builder->AddF("removeManagedUserWarningText", + IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING, + UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); builder->Add("removeManagedUserWarningButtonTitle", IDS_USER_IS_LOCALLY_MANAGED_REMOVE_WARNING_BUTTON); diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index c357943..f5ebe16 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -367,6 +367,10 @@ const char kChromeSyncLearnMoreURL[] = const char kChromeEnterpriseSignInLearnMoreURL[] = "http://support.google.com/chromeos/bin/answer.py?hl=en&answer=1331549"; +const char kSupervisedUserManagementURL[] = "https://www.chrome.com/manage"; + +const char kSupervisedUserManagementDisplayURL[] = "www.chrome.com/manage"; + const char kSettingsSearchHelpURL[] = #if defined(OS_CHROMEOS) "https://support.google.com/chromeos/?p=settings_search_help"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 46790fb..74d58f6 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -317,6 +317,13 @@ extern const char kChromeSyncLearnMoreURL[]; // "Learn more" URL for the enterprise sign-in confirmation dialog. extern const char kChromeEnterpriseSignInLearnMoreURL[]; +// Management URL for the supervised users. +extern const char kSupervisedUserManagementURL[]; + +// Management URL for the supervised users - version without scheme, used +// for display. +extern const char kSupervisedUserManagementDisplayURL[]; + // Help URL for the settings page's search feature. extern const char kSettingsSearchHelpURL[]; |