Change getAccessToken and getExtensionPrinterAccess to sendWithPromise

chrome/browser/resources/print_preview/native_layer.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.exportPath('print_preview');
 
 /**
  * @typedef {{selectSaveAsPdfDestination: boolean,
  *            layoutSettings.portrait: boolean,
  *            pageRange: string,
@@ skipping 48 matching lines @@
 
 /**
  * @typedef {{
  *   printerId: string,
  *   success: boolean,
  *   capabilities: Object,
  * }}
  */
 print_preview.PrinterSetupResponse;
 
+/**
+ * @typedef {{
+ *   extensionId: string,
+ *   extensionName: string,
+ *   id: string,
+ *   name: string,
+ *   description: (string|undefined),
+ * }}
+ */
+print_preview.ProvisionalDestinationInfo;
+
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * An interface to the native Chromium printing system layer.
    * @constructor
    */
   function NativeLayer() {
     // Bind global handlers
     global.setUseCloudPrint = this.onSetUseCloudPrint_.bind(this);
     global.reloadPrintersList = this.onReloadPrintersList_.bind(this);
     global.printToCloud = this.onPrintToCloud_.bind(this);
     global.fileSelectionCancelled = this.onFileSelectionCancelled_.bind(this);
     global.fileSelectionCompleted = this.onFileSelectionCompleted_.bind(this);
     global.printPreviewFailed = this.onPrintPreviewFailed_.bind(this);
     global.invalidPrinterSettings = this.onInvalidPrinterSettings_.bind(this);
     global.onDidGetDefaultPageLayout =
         this.onDidGetDefaultPageLayout_.bind(this);
     global.onDidGetPreviewPageCount = this.onDidGetPreviewPageCount_.bind(this);
     global.onDidPreviewPage = this.onDidPreviewPage_.bind(this);
     global.updatePrintPreview = this.onUpdatePrintPreview_.bind(this);
-    global.onDidGetAccessToken = this.onDidGetAccessToken_.bind(this);
     global.onEnableManipulateSettingsForTest =
         this.onEnableManipulateSettingsForTest_.bind(this);
     global.printPresetOptionsFromDocument =
         this.onPrintPresetOptionsFromDocument_.bind(this);
-    global.onProvisionalPrinterResolved =
-        this.onProvisionalDestinationResolved_.bind(this);
-    global.failedToResolveProvisionalPrinter =
-        this.failedToResolveProvisionalDestination_.bind(this);
 
     /** @private {!cr.EventTarget} */
     this.eventTarget_ = new cr.EventTarget();
   }
 
   /** @private {?print_preview.NativeLayer} */
   var currentInstance = null;
 
   /**
    * @return {!print_preview.NativeLayer} The singleton instance.
@@ skipping 12 matching lines @@
   NativeLayer.setInstance = function(instance) {
     currentInstance = instance;
   };
 
   /**
    * Event types dispatched from the Chromium native layer.
    * @enum {string}
    * @const
    */
   NativeLayer.EventType = {
-    ACCESS_TOKEN_READY: 'print_preview.NativeLayer.ACCESS_TOKEN_READY',
     CLOUD_PRINT_ENABLE: 'print_preview.NativeLayer.CLOUD_PRINT_ENABLE',
     DESTINATIONS_RELOAD: 'print_preview.NativeLayer.DESTINATIONS_RELOAD',
     DISABLE_SCALING: 'print_preview.NativeLayer.DISABLE_SCALING',
     FILE_SELECTION_CANCEL: 'print_preview.NativeLayer.FILE_SELECTION_CANCEL',
     FILE_SELECTION_COMPLETE:
         'print_preview.NativeLayer.FILE_SELECTION_COMPLETE',
     MANIPULATE_SETTINGS_FOR_TEST:
         'print_preview.NativeLayer.MANIPULATE_SETTINGS_FOR_TEST',
     PAGE_COUNT_READY: 'print_preview.NativeLayer.PAGE_COUNT_READY',
     PAGE_LAYOUT_READY: 'print_preview.NativeLayer.PAGE_LAYOUT_READY',
     PAGE_PREVIEW_READY: 'print_preview.NativeLayer.PAGE_PREVIEW_READY',
     PREVIEW_GENERATION_DONE:
         'print_preview.NativeLayer.PREVIEW_GENERATION_DONE',
     PREVIEW_GENERATION_FAIL:
         'print_preview.NativeLayer.PREVIEW_GENERATION_FAIL',
     PRINT_TO_CLOUD: 'print_preview.NativeLayer.PRINT_TO_CLOUD',
     SETTINGS_INVALID: 'print_preview.NativeLayer.SETTINGS_INVALID',
     PRINT_PRESET_OPTIONS: 'print_preview.NativeLayer.PRINT_PRESET_OPTIONS',
-    PROVISIONAL_DESTINATION_RESOLVED:
-        'print_preview.NativeLayer.PROVISIONAL_DESTINATION_RESOLVED'
   };
 
   /**
    * Constant values matching printing::DuplexMode enum.
    * @enum {number}
    */
   NativeLayer.DuplexMode = {SIMPLEX: 0, LONG_EDGE: 1, UNKNOWN_DUPLEX_MODE: -1};
 
   /**
    * Enumeration of color modes used by Chromium.
@@ skipping 12 matching lines @@
 
   NativeLayer.prototype = {
     /** @return {!cr.EventTarget} The event target for the native layer.*/
     getEventTarget: function() {
       return this.eventTarget_;
     },
 
     /**
      * Requests access token for cloud print requests.
      * @param {string} authType type of access token.
+     * @return {!Promise<string>}
      */
-    startGetAccessToken: function(authType) {
-      chrome.send('getAccessToken', [authType]);
+    getAccessToken: function(authType) {
+      return cr.sendWithPromise('getAccessToken', authType);
     },
 
     /**
      * Gets the initial settings to initialize the print preview with.
      * @return {!Promise<!print_preview.NativeInitialSettings>}
      */
     getInitialSettings: function() {
       return cr.sendWithPromise('getInitialSettings')
           .then(
               /**
@@ skipping 82 matching lines @@
      *     capabilities are requested.
      * @return {!Promise<!print_preview.Cdd>}
      */
     getExtensionPrinterCapabilities: function(destinationId) {
       return cr.sendWithPromise(
           'getExtensionPrinterCapabilities', destinationId);
     },
 
     /**
      * Requests Chrome to resolve provisional extension destination by granting
-     * the provider extension access to the printer. Chrome will respond with
-     * the resolved destination properties by calling
-     * {@code onProvisionalPrinterResolved}, or in case of an error
-     * {@code failedToResolveProvisionalPrinter}
+     * the provider extension access to the printer.
      * @param {string} provisionalDestinationId
+     * @return {!Promise<!print_preview.ProvisionalDestinationInfo>}
      */
     grantExtensionPrinterAccess: function(provisionalDestinationId) {
-      chrome.send('grantExtensionPrinterAccess', [provisionalDestinationId]);
+      return cr.sendWithPromise('grantExtensionPrinterAccess',
+                                provisionalDestinationId);
     },
 
     /**
      * Requests that Chrome peform printer setup for the given printer.
      * @param {string} printerId
      * @return {!Promise<!print_preview.PrinterSetupResponse>}
      */
     setupPrinter: function(printerId) {
       return cr.sendWithPromise('setupPrinter', printerId);
     },
@@ skipping 368 matching lines @@
     onDidPreviewPage_: function(pageNumber, previewUid, previewResponseId) {
       var pagePreviewGenEvent =
           new Event(NativeLayer.EventType.PAGE_PREVIEW_READY);
       pagePreviewGenEvent.pageIndex = pageNumber;
       pagePreviewGenEvent.previewUid = previewUid;
       pagePreviewGenEvent.previewResponseId = previewResponseId;
       this.eventTarget_.dispatchEvent(pagePreviewGenEvent);
     },
 
     /**
-     * Notification that access token is ready.
-     * @param {string} authType Type of access token.
-     * @param {string} accessToken Access token.
-     * @private
-     */
-    onDidGetAccessToken_: function(authType, accessToken) {
-      var getAccessTokenEvent =
-          new Event(NativeLayer.EventType.ACCESS_TOKEN_READY);
-      getAccessTokenEvent.authType = authType;
-      getAccessTokenEvent.accessToken = accessToken;
-      this.eventTarget_.dispatchEvent(getAccessTokenEvent);
-    },
-
-    /**
      * Update the print preview when new preview data is available.
      * Create the PDF plugin as needed.
      * Called from PrintPreviewUI::PreviewDataIsAvailable().
      * @param {number} previewUid Preview unique identifier.
      * @param {number} previewResponseId The preview request id that resulted in
      *     this response.
      * @private
      */
     onUpdatePrintPreview_: function(previewUid, previewResponseId) {
       var previewGenDoneEvent =
@@ skipping 12 matching lines @@
      * @private
      */
     onPrintPresetOptionsFromDocument_: function(options) {
       var printPresetOptionsEvent =
           new Event(NativeLayer.EventType.PRINT_PRESET_OPTIONS);
       printPresetOptionsEvent.optionsFromDocument = options;
       this.eventTarget_.dispatchEvent(printPresetOptionsEvent);
     },
 
     /**
-     * Called when Chrome reports that attempt to resolve a provisional
-     * destination failed.
-     * @param {string} destinationId The provisional destination ID.
-     * @private
-     */
-    failedToResolveProvisionalDestination_: function(destinationId) {
-      var evt =
-          new Event(NativeLayer.EventType.PROVISIONAL_DESTINATION_RESOLVED);
-      evt.provisionalId = destinationId;
-      evt.destination = null;
-      this.eventTarget_.dispatchEvent(evt);
-    },
-
-    /**
-     * Called when Chrome reports that a provisional destination has been
-     * successfully resolved.
-     * Currently used only for extension provided destinations.
-     * @param {string} provisionalDestinationId The provisional destination id.
-     * @param {!{extensionId: string,
-     *           extensionName: string,
-     *           id: string,
-     *           name: string,
-     *           description: (string|undefined)}} destinationInfo The resolved
-     *     destination info.
-     * @private
-     */
-    onProvisionalDestinationResolved_: function(
-        provisionalDestinationId, destinationInfo) {
-      var evt =
-          new Event(NativeLayer.EventType.PROVISIONAL_DESTINATION_RESOLVED);
-      evt.provisionalId = provisionalDestinationId;
-      evt.destination = destinationInfo;
-      this.eventTarget_.dispatchEvent(evt);
-    },
-
-    /**
      * Allows for onManipulateSettings to be called
      * from the native layer.
      * @private
      */
     onEnableManipulateSettingsForTest_: function() {
       global.onManipulateSettingsForTest =
           this.onManipulateSettingsForTest_.bind(this);
     },
 
     /**
@@ skipping 202 matching lines @@
       return this.serializedDefaultDestinationSelectionRulesStr_;
     }
   };
 
   // Export
   return {
     NativeInitialSettings: NativeInitialSettings,
     NativeLayer: NativeLayer
   };
 });