Split ShowPage message into two.

chrome/browser/resources/chromeos/arc_support/background.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
- * UI Pages. Note the order must be in sync with the ArcAuthService::UIPage
- * enum.
- * @type {Array<string>}
- */
-var UI_PAGES = ['none',
-                'terms',
-                'lso-loading',
-                'lso',
-                'arc-loading',
-                'error',
-                'error-with-feedback'];
-
-/**
  * Chrome window that hosts UI. Only one window is allowed.
  * @type {chrome.app.window.AppWindow}
  */
 var appWindow = null;
 
 /**
  * Contains Web content provided by Google authorization server.
  * @type {WebView}
  */
 var lsoView = null;
@@ skipping 338 matching lines @@
       this.state_ = LoadState.LOADED;
       this.showContent_();
     }
   }
 
   /** Called when the terms-view loading is aborted. */
   onTermsViewLoadAborted_(reason) {
     console.error('TermsView loading is aborted: ' + reason);
     // Mark ABORTED so that onTermsViewLoaded_() won't show the content view.
     this.state_ = LoadState.ABORTED;
-    setErrorMessage(
+    showErrorPage(
         appWindow.contentWindow.loadTimeData.getString('serverError'));
-    showPage('error');
   }
 
   /** Called when "AGREE" button is clicked. */
   onAgree() {
     termsAccepted = true;
 
     sendNativeMessage('onAgreed', {
       isMetricsEnabled: this.metricsCheckbox_.isChecked(),
       isBackupRestoreEnabled: this.backupRestoreCheckbox_.isChecked(),
       isLocationServiceEnabled: this.locationServiceCheckbox_.isChecked()
@@ skipping 86 matching lines @@
     termsPage.onBackupRestorePreferenceChanged(
         message.enabled, message.managed);
   } else if (message.action == 'setLocationServiceMode') {
     termsPage.onLocationServicePreferenceChanged(
         message.enabled, message.managed);
   } else if (message.action == 'closeWindow') {
     if (appWindow) {
       appWindow.close();
     }
   } else if (message.action == 'showPage') {
-    showPageWithStatus(message.page, message.status);
+    if (message.page != 'terms') {
+      // Explicit request to start not from start page. Assume terms are
+      // accepted in this case.
+      // TODO: this is only for controling "RETRY" button. Remove this.
+      termsAccepted = true;
+    }
+    showPage(message.page);
+  } else if (message.action == 'showErrorPage') {
+    // TODO: this is only for controling "RETRY" button. Remove this.
+    termsAccepted = true;
+    showErrorPage(message.errorMessage, message.shouldShowSendFeedback);
   } else if (message.action == 'setWindowBounds') {
     setWindowBounds();
   }
 }
 
 /**
  * Connects to ArcSupportHost.
  */
 function connectPort() {
   var hostName = 'com.google.arc_support';
   port = chrome.runtime.connectNative(hostName);
   port.onMessage.addListener(onNativeMessage);
 }
 
 /**
  * Shows requested page and hide others. Show appWindow if it was hidden before.
  * 'none' hides all views.
  * @param {string} pageDivId id of divider of the page to show.
  */
 function showPage(pageDivId) {
   if (!appWindow) {
     return;
   }
 
   hideOverlay();
   var doc = appWindow.contentWindow.document;
   var pages = doc.getElementsByClassName('section');
-  var sendFeedbackElement = doc.getElementById('button-send-feedback');
-  if (pageDivId == 'error-with-feedback') {
-    // Only show feedback button if the pageDivId is 'error-with-feedback'.
-    sendFeedbackElement.hidden = false;
-    pageDivId = 'error';
-  } else {
-    sendFeedbackElement.hidden = true;
-  }
   for (var i = 0; i < pages.length; i++) {
     pages[i].hidden = pages[i].id != pageDivId;
   }
 
   if (pageDivId == 'lso-loading') {
     lsoView.src = 'https://accounts.google.com/o/oauth2/v2/auth?client_id=' +
                   '1070009224336-sdh77n7uot3oc99ais00jmuft6sk2fg9.apps.' +
                   'googleusercontent.com&response_type=code&redirect_uri=oob&' +
                   'scope=https://www.google.com/accounts/OAuthLogin&' +
                   'device_type=arc_plus_plus&device_id=' + currentDeviceId +
                   '&hl=' + navigator.language;
   }
   appWindow.show();
   if (pageDivId == 'terms') {
     termsPage.onShow();
   }
 }
 
 /**
- * Sets error message.
- * @param {string} error message.
+ * Shows an error page, with given errorMessage.
+ *
+ * @param {string} errorMessage Localized error message text.
+ * @param {?boolean} opt_shouldShowSendFeedback If set to true, show "Send
+ *     feedback" button.
  */
-function setErrorMessage(error) {
+function showErrorPage(errorMessage, opt_shouldShowSendFeedback) {
   if (!appWindow) {
     return;
   }
+
   var doc = appWindow.contentWindow.document;
   var messageElement = doc.getElementById('error-message');
-  messageElement.innerText = error;
+  messageElement.innerText = errorMessage;
+
+  var sendFeedbackElement = doc.getElementById('button-send-feedback');
+  sendFeedbackElement.hidden = !opt_shouldShowSendFeedback;
+
+  showPage('error');
 }
 
 /**
  * Shows overlay dialog and required content.
  * @param {string} overlayClass Defines which content to show, 'overlay-url' for
  *                              webview based content and 'overlay-text' for
  *                              simple text view.
  */
 function showOverlay(overlayClass) {
   var doc = appWindow.contentWindow.document;
@@ skipping 40 matching lines @@
 
 /**
  * Hides overlay dialog.
  */
 function hideOverlay() {
   var doc = appWindow.contentWindow.document;
   var overlayContainer = doc.getElementById('overlay-container');
   overlayContainer.hidden = true;
 }
 
-/**
- * Shows requested page.
- * @param {int} pageId Index of the page to show. Must be in the array range of
- * UI_PAGES.
- * @param {string} status associated with page string status, error message for
- *                        example.
- */
-function showPageWithStatus(pageId, status) {
-  if (!appWindow) {
-    return;
-  }
-
-  if (UI_PAGES[pageId] != 'terms') {
-    // Explicit request to start not from start page. Assume terms are
-    // accepted in this case.
-    // TODO: this is only for controling "RETRY" button. Remove this.
-    termsAccepted = true;
-  }
-
-  if (UI_PAGES[pageId] == 'error' ||
-      UI_PAGES[pageId] == 'error-with-feedback') {
-    setErrorMessage(status);
-  }
-  showPage(UI_PAGES[pageId]);
-}
-
 function setWindowBounds() {
   if (!appWindow) {
     return;
   }
 
   var decorationWidth = appWindow.outerBounds.width -
       appWindow.innerBounds.width;
   var decorationHeight = appWindow.outerBounds.height -
       appWindow.innerBounds.height;
 
@@ skipping 35 matching lines @@
 
     var lsoError = false;
     var onLsoViewRequestResponseStarted = function(details) {
       if (isApprovalResponse(details.url)) {
         showPage('arc-loading');
       }
       lsoError = false;
     };
 
     var onLsoViewErrorOccurred = function(details) {
-      setErrorMessage(appWindow.contentWindow.loadTimeData.getString(
-          'serverError'));
-      showPage('error');
+      showErrorPage(
+          appWindow.contentWindow.loadTimeData.getString('serverError'));
       lsoError = true;
     };
 
     var onLsoViewContentLoad = function() {
       if (lsoError) {
         return;
       }
 
       if (!isApprovalResponse(lsoView.src)) {
         // Show LSO page when its content is ready.
         showPage('lso');
         // We have fixed width for LSO page in css file in order to prevent
         // unwanted webview resize animation when it is shown first time. Now
         // it safe to make it up to window width.
         lsoView.style.width = '100%';
         return;
       }
 
       lsoView.executeScript({code: 'document.title;'}, function(results) {
         var authCodePrefix = 'Success code=';
         if (results && results.length == 1 && typeof results[0] == 'string' &&
             results[0].substring(0, authCodePrefix.length) == authCodePrefix) {
           var authCode = results[0].substring(authCodePrefix.length);
           sendNativeMessage('onAuthSucceeded', {code: authCode});
         } else {
-          setErrorMessage(appWindow.contentWindow.loadTimeData.getString(
-              'authorizationFailed'));
-          showPage('error');
+          showErrorMessage(
+              appWindow.contentWindow.loadTimeData.getString(
+                  'authorizationFailed'));
         }
       });
     };
 
     var requestFilter = {
       urls: ['<all_urls>'],
       types: ['main_frame']
     };
 
     lsoView.request.onResponseStarted.addListener(
@@ skipping 62 matching lines @@
       type: 'chrome',
       color: '#ffffff'
     },
     'innerBounds': {
       'width': INNER_WIDTH,
       'height': INNER_HEIGHT
     }
   };
   chrome.app.window.create('main.html', options, onWindowCreated);
 });