Consolidate the strings used by the CrOS/desktop user manager screen.

BUG=NONE

Review URL: https://chromiumcodereview.appspot.com/24079002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222172 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/chromeos_strings.grdp

@@ -344,9 +344,6 @@ Press any key to continue exploring.
   <message name="IDS_LOGIN_PASSWORD">
     Password
   </message>
-  <message name="IDS_LOGIN_BUTTON">
-    Sign in
-  </message>
   <message name="IDS_DISABLED_ADD_USER_TOOLTIP" desc="Tooltip over disabled Add user button">
     The owner of this device has disabled new users from being added
   </message>
@@ -429,12 +426,6 @@ Press any key to continue exploring.
   <message name="IDS_LOGIN_OFFLINE_ERROR" desc="Error alert message on the offline login screen. Note: should by the same as the one used on the Gaia sign-in page.">
     The username or password you entered is incorrect.
   </message>
-  <message name="IDS_SCREEN_LOCK_ACTIVE_USER">
-    Currently signed in
-  </message>
-  <message name="IDS_SCREEN_LOCK_SIGN_OUT">
-    Sign out
-  </message>
   <message name="IDS_CREATE_ACCOUNT_BUTTON">
     Create a Google Account now
   </message>
@@ -444,9 +435,6 @@ Press any key to continue exploring.
   <message name="IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON">
     Skip sign-in and browse as Guest
   </message>
-  <message name="IDS_GO_INCOGNITO_BUTTON" desc="Text shown on Chrome OS login screen button that launches guest session. Should be short.">
-    Browse as Guest
-  </message>
   <message name="IDS_CREATE_ACCOUNT_HTML" desc="Text shown on side of Google sign-in UI.">
     If you don't have a Google Account you can <ph name="LINK_START">$1<ex>&gt;a&lt;</ex></ph>create a Google Account<ph name="LINK_END">$2<ex>&gt;/a&lt;</ex></ph> now.
   </message>
@@ -621,23 +609,12 @@ Press any key to continue exploring.
   <message name="IDS_LOCAL_STATE_ERROR_POWERWASH_BUTTON" desc="Button label to restart and powerwash the device.">
     Restart and Powerwash
   </message>
-  <message name="IDS_LOGIN_POD_USER_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_LOGIN_POD_USER_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.">
     If you've already registered on this device, you can <ph name="LINK2_START">$1<ex>&gt;a&lt;</ex></ph>sign in as an existing user<ph name="LINK2_END">$2<ex>&gt;/a&lt;</ex></ph>.
   </message>
   <message name="IDS_SHUTDOWN_BUTTON" desc="Text shown on shutdown button on login/locker screen">
     Shut down
   </message>
-  <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
-    Add user
-  </message>
   <message name="IDS_KIOSK_APPS_BUTTON" desc="Text shown on a button that brings up the kiosk apps menu on login screen">
     Apps
   </message>
@@ -3720,18 +3697,6 @@ Battery full
   <message name="IDS_LANGUAGES_MORE" desc="Main language list 'more' link. Expands all possible languages, not only the main ones.">
     More...
   </message>
-  <message name="IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT" desc="Text to display in the password field for user pod when no password has been entered.">
-    Enter password
-  </message>
-  <message name="IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME" desc="Text to be spoken when the focus is set to the password field of a user pod on the login screen.">
-    Password for <ph name="USER_EMAIL_ADDRESS">$1<ex>john.doe@example.com</ex></ph>
-  </message>
-  <message name="IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME" desc="Text to be spoken when the focus is set to the menu button of the user pod on the login screen.">
-    Options menu for <ph name="USER_EMAIL_ADDRESS">$1<ex>john.doe@example.com</ex></ph>
-  </message>
-  <message name="IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME" desc="Text to be spoken when 'Remove user' item is selected on the pod menu.">
-    Remove this user
-  </message>
   <message name="IDS_LOGIN_POD_OWNER_USER" desc="Login screen user pod menu title for a user who owns the device.">
     <ph name="USER_NAME">$1<ex>Ivan Arbuzov</ex></ph> (owner)
   </message>

chrome/app/generated_resources.grd

@@ -14382,7 +14382,7 @@ The supervised user's settings and browsing history will be merged across device
       Oops! The supervised user couldn't be imported. Please make sure you're signed in properly and try again.
     </message>
 
-    <if expr="not is_android and not is_ios and not pp_ifdef('chromeos')">
+    <if expr="not is_android and not is_ios">
       <!-- User manager web UI -->
       <if expr="pp_ifdef('use_titlecase')">
         <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
@@ -14394,7 +14394,7 @@ The supervised user's settings and browsing history will be merged across device
         <message name="IDS_LOGIN_BUTTON">
           Sign In
         </message>
-        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Login screen user pod menu item text.">
+        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
           Remove This User
         </message>
       </if>
@@ -14408,7 +14408,7 @@ The supervised user's settings and browsing history will be merged across device
         <message name="IDS_LOGIN_BUTTON">
           Sign in
         </message>
-        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Login screen user pod menu item text.">
+        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
           Remove this user
         </message>
       </if>
@@ -14433,9 +14433,16 @@ The supervised user's settings and browsing history will be merged across device
       <message name="IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME" desc="Text to be spoken when 'Remove user' item is selected on the pod menu.">
         Remove this user
       </message>
-      <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING" desc="Text shown as a warning when attempting to remove an user.">
-        Are you sure you want to delete this user and all the data associated with it from this computer? This cannot be undone!
-      </message>
+      <if expr="pp_ifdef('chromeos')">
+        <message name="IDS_LOGIN_POD_USER_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>
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING" desc="Text shown as a warning when attempting to remove an user.">
+          Are you sure you want to delete this user and all the data associated with it from this computer? This cannot be undone!
+        </message>
+      </if>
     </if>
 
     <!-- Aura strings -->