Print Preview: Change print to cr.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 59 matching lines @@
   '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);
@@ skipping 32 matching lines @@
   /**
    * 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}
    */
@@ skipping 252 matching lines @@
      * @param {!print_preview.Destination} destination Destination to print to.
      * @param {!print_preview.PrintTicketStore} printTicketStore Used to get the
      *     state of the print ticket.
      * @param {cloudprint.CloudPrintInterface} cloudPrintInterface Interface
      *     to Google Cloud Print.
      * @param {!print_preview.DocumentInfo} documentInfo Document data model.
      * @param {boolean=} opt_isOpenPdfInPreview Whether to open the PDF in the
      *     system's preview application.
      * @param {boolean=} opt_showSystemDialog Whether to open system dialog for
      *     advanced settings.
+     * @return {!Promise} Promise that will resolve when the print request is
+     *     finished or rejected.
      */
-    startPrint: function(
+    print: function(
         destination, printTicketStore, cloudPrintInterface, documentInfo,
         opt_isOpenPdfInPreview, opt_showSystemDialog) {
       assert(
           printTicketStore.isTicketValid(),
           'Trying to print when ticket is not valid');
 
       assert(
           !opt_showSystemDialog || (cr.isWindows && destination.isLocal),
           'Implemented for Windows only');
 
@@ skipping 55 matching lines @@
 
       if (destination.isPrivet || destination.isExtension) {
         ticket['ticket'] = printTicketStore.createPrintTicket(destination);
         ticket['capabilities'] = JSON.stringify(destination.capabilities);
       }
 
       if (opt_isOpenPdfInPreview) {
         ticket['OpenPDFInPreview'] = true;
       }
 
-      chrome.send('print', [JSON.stringify(ticket)]);
+      return cr.sendWithPromise('print', JSON.stringify(ticket));
     },
 
     /** Requests that the current pending print request be cancelled. */
     startCancelPendingPrint: function() {
       chrome.send('cancelPendingPrintRequest');
     },
 
     /** Shows the system's native printing dialog. */
     startShowSystemDialog: function() {
       assert(!cr.isWindows);
       chrome.send('showSystemDialog');
     },
 
-    /** Closes the print preview dialog. */
-    startCloseDialog: function() {
-      chrome.send('closePrintPreviewDialog');
+    /**
+     * Closes the print preview dialog.
+     * If |isCancel| is true, also sends a message to Print Preview Handler in
+     * order to update UMA statistics.
+     * @param {boolean} isCancel whether this was called due to the user
+     *     closing the dialog without printing.
+     */
+    startCloseDialog: function(isCancel) {
+      if (isCancel)
+        chrome.send('closePrintPreviewDialog');

[dpapad, 2017/06/23 23:17:26]

Nit (optional):

chrome.send(isCancel ? 'closePrintPreviewDialog', 'dialogClose');

[rbpotter, 2017/06/23 23:34:35]

We want to send dialogClose either way though, so this wouldn't this
require adding if (!isCancel) below?

[dpapad, 2017/06/23 23:45:01]

Ah right, I misread the original code. Ignore my suggestion.

       chrome.send('dialogClose');
     },
 
     /** Hide the print preview dialog and allow the native layer to close it. */
     startHideDialog: function() {
       chrome.send('hidePreview');
     },
 
     /**
      * Opens the Google Cloud Print sign-in tab. The DESTINATIONS_RELOAD event
@@ skipping 39 matching lines @@
       this.eventTarget_.dispatchEvent(cloudPrintEnableEvent);
     },
 
     /** Reloads the printer list. */
     onReloadPrintersList_: function() {
       cr.dispatchSimpleEvent(
           this.eventTarget_, NativeLayer.EventType.DESTINATIONS_RELOAD);
     },
 
     /**
-     * Called from the C++ layer.
-     * Take the PDF data handed to us and submit it to the cloud, closing the
-     * print preview dialog once the upload is successful.
-     * @param {string} data Data to send as the print job.
-     * @private
-     */
-    onPrintToCloud_: function(data) {
-      var printToCloudEvent = new Event(NativeLayer.EventType.PRINT_TO_CLOUD);
-      printToCloudEvent.data = data;
-      this.eventTarget_.dispatchEvent(printToCloudEvent);
-    },
-
-    /**
-     * Called from PrintPreviewUI::OnFileSelectionCancelled to notify the print
-     * preview dialog regarding the file selection cancel event.
-     * @private
-     */
-    onFileSelectionCancelled_: function() {
-      cr.dispatchSimpleEvent(
-          this.eventTarget_, NativeLayer.EventType.FILE_SELECTION_CANCEL);
-    },
-
-    /**
-     * Called from PrintPreviewUI::OnFileSelectionCompleted to notify the print
-     * preview dialog regarding the file selection completed event.
-     * @private
-     */
-    onFileSelectionCompleted_: function() {
-      // If the file selection is completed and the dialog is not already closed
-      // it means that a pending print to pdf request exists.
-      cr.dispatchSimpleEvent(
-          this.eventTarget_, NativeLayer.EventType.FILE_SELECTION_COMPLETE);
-    },
-
-    /**
      * Display an error message when print preview fails.
      * Called from PrintPreviewMessageHandler::OnPrintPreviewFailed().
      * @private
      */
     onPrintPreviewFailed_: function() {
       cr.dispatchSimpleEvent(
           this.eventTarget_, NativeLayer.EventType.PREVIEW_GENERATION_FAIL);
     },
 
     /**
@@ skipping 361 matching lines @@
       return this.serializedDefaultDestinationSelectionRulesStr_;
     }
   };
 
   // Export
   return {
     NativeInitialSettings: NativeInitialSettings,
     NativeLayer: NativeLayer
   };
 });