Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / chromeos / login / screen_error_message.html

diff --git a/src/chrome/browser/resources/chromeos/login/screen_error_message.html b/src/chrome/browser/resources/chromeos/login/screen_error_message.html
index 71c8f48..43236e0 100644 (file)
--- a/src/chrome/browser/resources/chromeos/login/screen_error_message.html
+++ b/src/chrome/browser/resources/chromeos/login/screen_error_message.html
@@ -1,4 +1,4 @@
-<div id="error-message" class="step hidden show-offline-error">
+<div id="error-message" class="step hidden show-offline-error" hidden>
   <div class="step-contents">
     <div class="error-header">
       <img alt class="error-icon" src="chrome://theme/IDR_ERROR_NETWORK_OFFLINE">
@@ -12,8 +12,22 @@
                  show-with-error-state-auth-ext-timeout
                  show-with-ui-state-local-state-error">
       </div>
+      <div id="kiosk-online-title" i18n-content="kioskOnlineTitle"
+          class="error-title
+                 show-with-error-state-kiosk-online">
+      </div>
+      <div id="rollback-error-title" i18n-content="rollbackErrorTitle"
+           class="error-title
+                 show-with-ui-state-rollback-error">
+      </div>
     </div>
     <div class="error-body">
+      <div id="kiosk-online-message-body"
+          class="error-message-paragraph
+                 show-with-error-state-kiosk-online">
+        <span i18n-content="kioskOnlineMessageBody"
+            class="show-with-error-state-kiosk-online"></span>
+      </div>
       <div id="offline-message-body"
           class="error-message-paragraph
                  show-with-error-state-offline
@@ -28,6 +42,8 @@
         <span id="kiosk-offline-message-text"
             i18n-content="kioskOfflineMessageBody"
             class="show-with-ui-state-kiosk-mode"></span>
+        <span id="auto-enrollment-offline-message-text"
+            class="show-with-ui-state-auto-enrollment-error"></span>
       </div>
       <div id="captive-portal-message-body"
           class="error-message-paragraph
@@ -36,7 +52,8 @@
             class="show-with-ui-state-update
                    show-with-ui-state-signin
                    show-with-ui-state-locally-managed
-                   show-with-ui-state-kiosk-mode"></span>
+                   show-with-ui-state-kiosk-mode
+                   show-with-ui-state-auto-enrollment-error"></span>
       </div>
       <div id="captive-portal-proxy-message-body"
           class="error-message-paragraph
@@ -46,13 +63,15 @@
             class="show-with-ui-state-update
                    show-with-ui-state-signin
                    show-with-ui-state-locally-managed
-                   show-with-ui-state-kiosk-mode"></span>
+                   show-with-ui-state-kiosk-mode
+                   show-with-ui-state-auto-enrollment-error"></span>
       </div>
       <div id="proxy-message-body"
           class="error-message-paragraph
                  show-with-error-state-proxy">
         <span id="update-proxy-message-text"
-            class="show-with-ui-state-update"></span>
+            class="show-with-ui-state-update
+                   show-with-ui-state-auto-enrollment-error"></span>
         <span id="signin-proxy-message-text"
             class="show-with-ui-state-signin
                    show-with-ui-state-locally-managed
@@ -62,14 +81,16 @@
           class="show-with-ui-state-update
                  show-with-ui-state-signin
                  show-with-ui-state-locally-managed
-                 show-with-ui-state-kiosk-mode">
+                 show-with-ui-state-kiosk-mode
+                 show-with-ui-state-auto-enrollment-error">
         <div id="offline-network-control" class="error-message-paragraph">
           <label for="offline-networks-list-dropdown"
               i18n-content="selectNetwork"
               class="offline-network-list-label
                      show-with-error-state-offline
                      show-with-error-state-proxy
-                     show-with-error-state-auth-timeout"></label>
+                     show-with-error-state-auth-timeout
+                     show-with-error-state-kiosk-online"></label>
           <label for="offline-networks-list-dropdown"
               i18n-content="selectAnotherNetwork"
               class="offline-network-list-label
@@ -89,10 +110,28 @@
             class="error-message-paragraph">
         </div>
       </div>
-      <div id="error-guest-signin" class="error-message-paragraph guest-signin">
+      <div id="rollback-error-message-body"
+          class="error-message-paragraph
+                 show-with-ui-state-rollback-error">
+        <span i18n-content="rollbackErrorMessageBody"
+            class="show-with-ui-state-rollback-error"></span>
+      </div>
+      <div class="show-with-ui-state-update
+                  show-with-ui-state-signin
+                  show-with-ui-state-locally-managed
+                  show-with-ui-state-kiosk-mode
+                  show-with-ui-local-state-error">
+        <span id="error-guest-signin"
+            class="error-message-paragraph guest-signin"></span>
+      </div>
+      <div class="show-with-ui-state-auto-enrollment-error">
+        <span id="error-guest-signin-fix-network"
+            class="error-message-paragraph guest-signin"></span>
       </div>
       <div id="error-offline-login"
           class="error-message-paragraph offline-login"></div>
+      <div id="connecting-indicator"
+          class="connecting-indicator error-message-paragraph"></div>
     </div>
   </div>
   <div class="error-controls">