[Chromoting] Show any startup errors in the LoadingWindow.

remoting/webapp/base/js/message_window.js

 // Copyright 2014 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.
 
 'use strict';
 
 /**
  * @constructor
  */
 function MessageWindowImpl() {
@@ skipping 44 matching lines @@
 MessageWindowImpl.prototype.initButton_ =
     function(button, label, clickHandler) {
   if (label) {
     button.innerText = label;
     button.addEventListener('click', clickHandler, false);
   }
   button.hidden = !Boolean(label);
 };
 
 /**
+ * Updates the button label text.
+ * Hides the button if the label is null or undefined.
+ *
+ * @param{HTMLElement} button
+ * @param{?string} label
+ * @private
+ */
+MessageWindowImpl.prototype.updateButton_ = function(button, label) {
+  if (label) {
+    button.innerText = label;
+  }
+  button.hidden = !Boolean(label);
+};
+
+/**
  * Event-handler callback, invoked when the parent window supplies the
  * message content.
  *
  * @param{Event} event
  * @private
  */
 MessageWindowImpl.prototype.onMessage_ = function(event) {
   switch (event.data['command']) {
     case 'show':
       // Validate the message.
       var messageId = /** @type {number} */ (event.data['id']);
       var title = /** @type {string} */ (event.data['title']);
       var message = /** @type {string} */ (event.data['message']);
       var infobox = /** @type {string} */ (event.data['infobox']);
       var buttonLabel = /** @type {string} */ (event.data['buttonLabel']);
-      /** @type {string} */
-      var cancelButtonLabel = (event.data['cancelButtonLabel']);
+      var cancelButtonLabel = /** @type {string} */
+          (event.data['cancelButtonLabel']);
       var showSpinner = /** @type {boolean} */ (event.data['showSpinner']);
       if (typeof(messageId) != 'number' ||
           typeof(title) != 'string' ||
           typeof(message) != 'string' ||
           typeof(infobox) != 'string' ||
           typeof(buttonLabel) != 'string' ||
           typeof(showSpinner) != 'boolean') {
         console.log('Bad show message:', event.data);
         break;
       }
@@ skipping 35 matching lines @@
       // of the buttons. This will send a 0 as the result.
       // Note that when a button is pressed, this will result in sendReply_
       // being called multiple times (once for the button, once for close).
       chrome.app.window.current().onClosed.addListener(
           this.sendReply_.bind(this, event.source, messageId, 0));
 
       base.resizeWindowToContent();
       chrome.app.window.current().show();
       break;
 
     case 'update_message':

[Jamie, 2015/05/09 01:17:00]

How about renaming this message 'update' and having it take the same parameters
as show, although with all of them optional to indicate "no change"? It would
mean that a lot of the code could be shared with the 'show' message, and any
parameter could be changed on the fly, rather than these select few.

[garykac, 2015/05/11 21:34:16]

Done.

       var message = /** @type {string} */ (event.data['message']);
+      var buttonLabel = /** @type {string} */ (event.data['buttonLabel']);
+      var cancelButtonLabel = /** @type {string} */
+          (event.data['cancelButtonLabel']);
+      var showSpinner = /** @type {boolean} */ (event.data['showSpinner']);
+      // The update_message may leave the buttonLabel, cancelButtonLabel and
+      // showSpinner values undefined to have them retain their current values.
       if (typeof(message) != 'string') {
         console.log('Bad update_message message:', event.data);
         break;
       }
 
+      var button = document.getElementById('button-primary');
+      var cancelButton = document.getElementById('button-secondary');
       var messageDiv = document.getElementById('message');
+
       messageDiv.innerText = message;
 
+      // If showSpinner was not specified, then don't change its state.
+      if (typeof(showSpinner) == 'boolean') {
+        if (showSpinner) {
+          messageDiv.classList.add('waiting');
+          messageDiv.classList.add('prominent');
+        } else {
+          messageDiv.classList.remove('waiting');
+          messageDiv.classList.remove('prominent');
+        }
+      }
+
+      this.updateButton_(button, buttonLabel);
+      this.updateButton_(cancelButton, cancelButtonLabel);
+
       base.resizeWindowToContent(true);
       break;
 
     default:
       console.error('Unexpected message:', event.data);
   }
 };
 
 var messageWindow = new MessageWindowImpl();