LMU creation : nicer user/password error messages

BUG=229762
R=nkostylev@chromium.org

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

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

chrome/app/chromeos_strings.grdp

@@ -480,11 +480,11 @@ Press any key to continue exploring.
   <message name="IDS_CREATE_LOCALLY_MANAGED_USER_INSTRUCTIONS_TEXT" desc="Messsage indicating that instructions will be sent to manager's email.">
     To configure this profile, please check your email at <ph name="MANAGER_EMAIL">$1<ex>john.doe@example.com</ex></ph> for further instructions.
   </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 machine.">
-    User with name <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph> already exists.
+  <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.">
+    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.">
-    Passwords do 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.">
     Password is too short.

chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css

@@ -65,11 +65,6 @@
   padding: 4px 6px;
 }
 
-#managed-user-creation-flow-password-error {
-  height: 16px;
-  margin-top: 10px;
-}
-
 #managed-user-creation-flow-name-error,
 #managed-user-creation-flow-password-error {
   visibility: hidden;
@@ -77,8 +72,7 @@
 
 #managed-user-creation-flow-name-error.error,
 #managed-user-creation-flow-password-error.error {
-  background: url('chrome://theme/IDR_WARNING') left top /24px no-repeat;
-  color: red;
+  color: rgb(207, 93, 70);
   padding-left: 28px;
   visibility: visible;
 }

chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html

@@ -42,15 +42,15 @@
         <div>
           <input id="managed-user-creation-flow-password" type="password"
               i18n-values="placeholder:createManagedUserPasswordHint" />
-          </div>
+          <span id="managed-user-creation-flow-password-error" class="no-error">
+          </span>
+        </div>
         <div>
           <input id="managed-user-creation-flow-password-confirm"
               type="password"
               i18n-values="placeholder:createManagedUserPasswordConfirmHint" />
         </div>
       </div>
-      <div id="managed-user-creation-flow-password-error" class="no-error">
-      </div>
     </div>
     <div id="managed-user-creation-flow-tutorial" class="step-no-logo" hidden>
       <div id="managed-user-creation-flow-tutorial-placeholder">

chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc

@@ -179,9 +179,8 @@ void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName(
   if (NULL != UserManager::Get()->
           FindLocallyManagedUser(CollapseWhitespace(name, true))) {
     CallJS("login.LocallyManagedUserCreationScreen.managedUserNameError",
-           name, l10n_util::GetStringFUTF16(
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS,
-               name));
+           name, l10n_util::GetStringUTF16(
+               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS));
   } else {
     CallJS("login.LocallyManagedUserCreationScreen.managedUserNameOk", name);
   }