Cros: Tweak "incorrect password" message

* Remove "Caps Lock is on" message
* Alter keyboard layout message

Bug: 551167
Change-Id: Ie258138e74abccd45183b807ea57c8937e721518
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808385
Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697136}

chrome/app/chromeos_strings.grdp

@@ -1815,11 +1815,8 @@
   <message name="IDS_LOGIN_ERROR_OFFLINE_FAILED_NETWORK_NOT_CONNECTED" desc="Couldn't sign in because offline sign-in has failed and network is not connected">
     Sorry, your email or password could not be verified. Try connecting to a network first.
   </message>
-  <message name="IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT" desc="A hint text for the login and lock screens about layout switching">
-    Hit Control-Shift-Space to switch keyboard layout.
-  </message>
-  <message name="IDS_LOGIN_ERROR_CAPS_LOCK_HINT" desc="A hint text for the login and lock screens that Caps Lock is on">
-    Caps Lock is on.
+  <message name="IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT" desc="A hint text for the login and lock screens about correct layout">
+    Check your keyboard layout and try again.
   </message>
   <message name="IDS_LOGIN_ERROR_CAPTIVE_PORTAL" desc="An error message shown when we suggest that user may be behind the captive portal.">
     Before signing in, please enter as Guest to activate the network <ph name="NETWORK_ID">$1<ex>Public Wifi</ex></ph>

chrome/browser/chromeos/login/ui/login_display_mojo.cc

@@ -167,15 +167,8 @@ void LoginDisplayMojo::ShowError(int error_msg_id,
       error_msg_id != IDS_LOGIN_ERROR_OWNER_KEY_LOST &&
       error_msg_id != IDS_LOGIN_ERROR_OWNER_REQUIRED &&
       error_msg_id != IDS_LOGIN_ERROR_GOOGLE_ACCOUNT_NOT_ALLOWED) {
-    // Display a warning if Caps Lock is on.
     input_method::InputMethodManager* ime_manager =
         input_method::InputMethodManager::Get();
-    if (ime_manager->GetImeKeyboard()->CapsLockIsEnabled()) {
-      // TODO(ivankr): use a format string instead of concatenation.
-      error_text +=
-          "\n" + l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_CAPS_LOCK_HINT);
-    }
-
     // Display a hint to switch keyboards if there are other active input
     // methods.
     if (ime_manager->GetActiveIMEState()->GetNumActiveInputMethods() > 1) {

chrome/browser/chromeos/login/ui/login_display_webui.cc

@@ -130,14 +130,8 @@ void LoginDisplayWebUI::ShowError(int error_msg_id,
       error_msg_id != IDS_LOGIN_ERROR_OWNER_KEY_LOST &&
       error_msg_id != IDS_LOGIN_ERROR_OWNER_REQUIRED &&
       error_msg_id != IDS_LOGIN_ERROR_GOOGLE_ACCOUNT_NOT_ALLOWED) {
-    // Display a warning if Caps Lock is on.
     input_method::InputMethodManager* ime_manager =
         input_method::InputMethodManager::Get();
-    if (ime_manager->GetImeKeyboard()->CapsLockIsEnabled()) {
-      // TODO(ivankr): use a format string instead of concatenation.
-      error_text +=
-          "\n" + l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_CAPS_LOCK_HINT);
-    }
 
     // Display a hint to switch keyboards if there are other active input
     // methods.