Fixed GAIA timeout error message.

BUG=175509
TEST=Manual tests on Lumpy


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

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

chrome/app/chromeos_strings.grdp

@@ -3551,9 +3551,6 @@ Battery full
   <message name="IDS_LOGIN_ERROR_CAPTIVE_PORTAL_NO_GUEST_MODE" desc="An error message shown when we suggest that user may be behind the captive portal but Guest mode is disabled.">
     Your password cannot be verified on this current network. Please select another network.
   </message>
-  <message name="IDS_LOGIN_TIMEOUT_TITLE" desc="An offline message title shown when Gaia frame loading is timed out.">
-    Gaia loading timeout
-  </message>
   <message name="IDS_NOTIFICATION_PANEL_TITLE" desc="Text for the title of the notification panel.">
     Notifications
   </message>

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

@@ -3,20 +3,18 @@
     <div id="error-message-screen-title">
       <span id="captive-portal-title" i18n-content="captivePortalTitle"
           class="show-with-captive-portal-error show-with-proxy-error"></span>
-      <span id="timeout-message-title" i18n-content="timeoutMessageTitle"
-          class="show-with-timeout-error"></span>
       <span id="error-message-title" i18n-content="offlineMessageTitle"
-          class="show-with-offline-error"></span>
+          class="show-with-offline-error show-with-timeout-error"></span>
     </div>
     <div id="error-message-body">
       <span id="offline-message-text" i18n-content="offlineMessageBody"
-          class="show-with-offline-error"></span>
+          class="show-with-offline-error show-with-timeout-error"></span>
       <div id="captive-portal-message-text"
           class="show-with-captive-portal-error"></div>
       <div id="captive-portal-proxy-message-text"
-          class="show-with-captive-portal-error"></div>
+          class="show-with-captive-portal-error show-with-timeout-error"></div>
       <div id="proxy-message-text"
-          class="show-with-proxy-error show-with-timeout-error"></div>
+          class="show-with-proxy-error"></div>
     </div>
     <div id="offline-network-control" class="control-with-label">
       <label for="offline-networks-list-dropdown" i18n-content="selectNetwork"

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

@@ -157,8 +157,6 @@ void ErrorScreenHandler::GetLocalizedStrings(
       l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL));
   localized_strings->SetString("captivePortalProxyMessage",
       l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_PROXY));
-  localized_strings->SetString("timeoutMessageTitle",
-      l10n_util::GetStringUTF16(IDS_LOGIN_TIMEOUT_TITLE));
   localized_strings->SetString("captivePortalNetworkSelect",
       l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT));
   localized_strings->SetString("proxyMessageText",