Merge 153263 - Fixes cloud-printer being treated as local-printer problem.

chrome/browser/resources/print_preview/cloud_print_interface.js

 // Copyright (c) 2012 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.
 
 cr.define('cloudprint', function() {
   'use strict';
 
   /**
    * API to the Google Cloud Print service.
    * @param {string} baseUrl Base part of the Google Cloud Print service URL
@@ skipping 18 matching lines @@
     this.xsrfToken_ = '';
   };
 
   /**
    * Event types dispatched by the interface.
    * @enum {string}
    */
   CloudPrintInterface.EventType = {
     ERROR: 'cloudprint.CloudPrintInterface.ERROR',
     PRINTER_DONE: 'cloudprint.CloudPrintInterface.PRINTER_DONE',
+    PRINTER_FAILED: 'cloudprint.CloudPrintInterface.PRINTER_FAILED',
     SEARCH_DONE: 'cloudprint.CloudPrintInterface.SEARCH_DONE',
     SUBMIT_DONE: 'cloudprint.CloudPrintInterface.SUBMIT_DONE'
   };
 
   /**
    * Content type header value for a URL encoded HTTP request.
    * @type {string}
    * @private
    */
   CloudPrintInterface.URL_ENCODED_CONTENT_TYPE_ =
@@ skipping 24 matching lines @@
      * @param {boolean} isRecent Whether to search for only recently used
      *     printers.
      */
     search: function(isRecent) {
       var params = {};
       if (isRecent) {
         params['q'] = '^recent';
       }
       params['connection_status'] = 'ALL';
       params['client'] = 'chrome';
-      this.sendRequest_('GET', 'search', params, null, this.onSearchDone_);
+      this.sendRequest_(
+          'GET', 'search', params, null, this.onSearchDone_.bind(this));
     },
 
     /**
      * Sends a Google Cloud Print submit API request.
      * @param {string} body Body of the HTTP post request to send.
      */
     submit: function(body) {
-      this.sendRequest_('POST', 'submit', null, body, this.onSubmitDone_);
+      this.sendRequest_(
+          'POST', 'submit', null, body, this.onSubmitDone_.bind(this));
     },
 
     /**
      * Sends a Google Cloud Print printer API request.
      * @param {string} printerId ID of the printer to lookup.
      */
     printer: function(printerId) {
       var params = {'printerid': printerId};
-      this.sendRequest_('GET', 'printer', params, null, this.onPrinterDone_);
+      this.sendRequest_(
+        'GET', 'printer', params, null,
+        this.onPrinterDone_.bind(this),
+        this.onPrinterFailed_.bind(this, printerId));
     },
 
     /**
      * Sends a Google Cloud Print update API request to accept (or reject) the
      * terms-of-service of the given printer.
      * @param {string} printerId ID of the printer to accept the
      *     terms-of-service for.
      * @param {boolean} isAccepted Whether the user accepted the
      *     terms-of-service.
      */
@@ skipping 72 matching lines @@
     },
 
     /**
      * Sends a request to the Google Cloud Print API.
      * @param {string} method HTTP method of the request.
      * @param {string} action Google Cloud Print action to perform.
      * @param {Object} params HTTP parameters to include in the request.
      * @param {string} body HTTP multi-part encoded body.
      * @param {function(Object)} successCallback Callback to invoke when request
      *     completes successfully.
+     * @param {function(Object)=} opt_failureCallback Callback to call if the
+     *     request failed.
      */
-    sendRequest_: function(method, action, params, body, successCallback) {
+    sendRequest_: function(method, action, params, body, successCallback,
+                           opt_failureCallback) {
       if (!this.xsrfToken_) {
         // TODO(rltoscano): Should throw an error if not a read-only action or
         // issue an xsrf token request.
       }
       var url = this.baseURL_ + '/' + action + '?xsrf=' + this.xsrfToken_;
 
       if (params) {
         for (var paramName in params) {
           url += '&' + paramName + '=' + encodeURIComponent(params[paramName]);
         }
       }
 
       var headers = {};
       headers['X-CloudPrint-Proxy'] = 'ChromePrintPreview';
       if (method == 'GET') {
         headers['Content-Type'] = CloudPrintInterface.URL_ENCODED_CONTENT_TYPE_;
       } else if (method == 'POST') {
         headers['Content-Type'] = CloudPrintInterface.MULTIPART_CONTENT_TYPE_;
       }
 
       var xhr = new XMLHttpRequest();
       xhr.onreadystatechange = this.onReadyStateChange_.bind(
-          this, xhr, successCallback.bind(this));
+          this, xhr, successCallback, opt_failureCallback);
       xhr.open(method, url, true);
       xhr.withCredentials = true;
       for (var header in headers) {
         xhr.setRequestHeader(header, headers[header]);
       }
       xhr.send(body);
     },
 
     /**
      * Dispatches an ERROR event with the given error message.
      * @param {string} message Error message to include in the ERROR event.
      * @private
      */
     dispatchErrorEvent_: function(message) {
       var errorEvent = new cr.Event(CloudPrintInterface.EventType.ERROR);
       errorEvent.message = message;
       this.dispatchEvent(errorEvent);
     },
 
     /**
      * Called when the ready-state of a XML http request changes.
      * Calls the successCallback with the result or dispatches an ERROR event.
      * @param {XMLHttpRequest} xhr XML http request that changed.
      * @param {function(Object)} successCallback Callback to call if the request
      *     was successful.
+     * @param {function(Object)=} opt_failureCallback Callback to call if the
+     *     request failed.
      * @private
      */
-    onReadyStateChange_: function(xhr, successCallback) {
+    onReadyStateChange_: function(xhr, successCallback, opt_failureCallback) {
       if (xhr.readyState == 4) {
         if (xhr.status == 200) {
           var result = JSON.parse(xhr.responseText);
           if (result['success']) {
             this.xsrfToken_ = result['xsrf_token'];
             successCallback(result);
+          } else if (opt_failureCallback) {
+            opt_failureCallback(result);
           } else {
             this.dispatchErrorEvent_(result['message']);
           }
         } else {
           this.dispatchErrorEvent_(xhr.status + '');
         }
       }
     },
 
     /**
@@ skipping 49 matching lines @@
             JSON.stringify(printerJson));
         return;
       }
       var printerDoneEvent =
           new cr.Event(CloudPrintInterface.EventType.PRINTER_DONE);
       printerDoneEvent.printer = printer;
       this.dispatchEvent(printerDoneEvent);
     },
 
     /**
+     * Called when the printer request fails.
+     * @param {string} ID of the destination that failed to be looked up.
+     * @param {object} Contains the JSON response.
+     * @private
+     */
+    onPrinterFailed_: function(destinationId, result) {
+      var printerFailedEvent = new cr.Event(
+          CloudPrintInterface.EventType.PRINTER_FAILED);
+      printerFailedEvent.destinationId = destinationId;
+      printerFailedEvent.errorCode = result['errorCode'];
+      this.dispatchEvent(printerFailedEvent);
+    },
+
+    /**
      * Called when the update printer TOS acceptance request completes
      * successfully.
      * @param {Object} result JSON response.
      * @private
      */
     onUpdatePrinterTosAcceptanceDone_: function(result) {
       // Do nothing.
     }
   };
 
   // Export
   return {
     CloudPrintInterface: CloudPrintInterface
   };
 });