Print Preview: Change print to cr.sendWithPromise

chrome/browser/resources/print_preview/print_preview.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.
 
 // TODO(rltoscano): Move data/* into print_preview.data namespace
 
 // <include src="component.js">
 // <include src="print_preview_focus_manager.js">
 //
 
@@ skipping 334 matching lines @@
     /** @override */
     enterDocument: function() {
       // Native layer events.
       var nativeLayerEventTarget = this.nativeLayer_.getEventTarget();
       this.tracker.add(
           nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.CLOUD_PRINT_ENABLE,
           this.onCloudPrintEnable_.bind(this));
       this.tracker.add(
           nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.PRINT_TO_CLOUD,
-          this.onPrintToCloud_.bind(this));
-      this.tracker.add(
-          nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.FILE_SELECTION_CANCEL,
-          this.onFileSelectionCancel_.bind(this));
-      this.tracker.add(
-          nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.FILE_SELECTION_COMPLETE,
-          this.onFileSelectionComplete_.bind(this));
-      this.tracker.add(
-          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.SETTINGS_INVALID,
           this.onSettingsInvalid_.bind(this));
       this.tracker.add(
           nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.PRINT_PRESET_OPTIONS,
           this.onPrintPresetOptionsFromDocument_.bind(this));
       this.tracker.add(
           nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.PAGE_COUNT_READY,
           this.onPageCountReady_.bind(this));
@@ skipping 160 matching lines @@
       } else if (
           this.destinationStore_.selectedDestination.id ==
           print_preview.Destination.GooglePromotedId.SAVE_AS_PDF) {
         this.uiState_ = PrintPreviewUiState_.FILE_SELECTION;
       } else {
         this.uiState_ = PrintPreviewUiState_.PRINTING;
       }
       this.setIsEnabled_(false);
       this.printHeader_.isCancelButtonEnabled = true;
       var printAttemptResult = this.printIfReady_();
-      if (printAttemptResult == print_preview.PrintAttemptResult_.PRINTED ||
-          printAttemptResult ==
-              print_preview.PrintAttemptResult_.READY_WAITING_FOR_PREVIEW) {
+      if (printAttemptResult ==
+          print_preview.PrintAttemptResult_.READY_WAITING_FOR_PREVIEW) {
         if ((this.destinationStore_.selectedDestination.isLocal &&
              !this.destinationStore_.selectedDestination.isPrivet &&
              !this.destinationStore_.selectedDestination.isExtension &&
              this.destinationStore_.selectedDestination.id !=
                  print_preview.Destination.GooglePromotedId.SAVE_AS_PDF) ||
             this.uiState_ == PrintPreviewUiState_.OPENING_PDF_PREVIEW) {
           // Hide the dialog for now. The actual print command will be issued
           // when the preview generation is done.
           this.nativeLayer_.startHideDialog();
         }
@@ skipping 23 matching lines @@
           this.printTicketStore_.isTicketValid(),
           'Trying to print with invalid ticket');
       if (getIsVisible(this.moreSettings_.getElement())) {
         new print_preview.PrintSettingsUiMetricsContext().record(
             this.moreSettings_.isExpanded ?
                 print_preview.Metrics.PrintSettingsUiBucket
                     .PRINT_WITH_SETTINGS_EXPANDED :
                 print_preview.Metrics.PrintSettingsUiBucket
                     .PRINT_WITH_SETTINGS_COLLAPSED);
       }
-      this.nativeLayer_.startPrint(
-          assert(this.destinationStore_.selectedDestination),
-          this.printTicketStore_, this.cloudPrintInterface_, this.documentInfo_,
+      var destination = assert(this.destinationStore_.selectedDestination);
+      var whenPrintDone = this.nativeLayer_.print(
+          destination, this.printTicketStore_, this.cloudPrintInterface_,
+          this.documentInfo_,
           this.uiState_ == PrintPreviewUiState_.OPENING_PDF_PREVIEW,
           this.showSystemDialogBeforeNextPrint_);
+
+      if (!destination.isLocal) {
+        // Cloud print resolves when print data is returned to submit to cloud
+        // print, or if setings are invalid.
+        whenPrintDone.then(
+            this.onPrintToCloud_.bind(this),
+            this.onSettingsInvalid_.bind(this));
+      } else if (destination.isPrivet || destination.isExtension) {
+        // Privet and extension resolve when printing is complete or if there
+        // is an error printing.
+        whenPrintDone.then(
+            this.close_.bind(this, false),
+            this.onPrintFailed_.bind(this));
+      } else if (
+          destination.id ==
+          print_preview.Destination.GooglePromotedId.SAVE_AS_PDF) {
+        // Save as PDF resolves when file selection is completed or cancelled.
+        whenPrintDone.then(
+            this.onFileSelectionComplete_.bind(this),
+            this.onFileSelectionCancel_.bind(this));
+      } else {  // standard local printer
+        var boundHideDialog = function () {
+          this.nativeLayer_.startHideDialog();
+        }.bind(this);
+        // Local printers resolve when print is started. Hide the dialog.
+        whenPrintDone.then(boundHideDialog, boundHideDialog);
+      }
+
       this.showSystemDialogBeforeNextPrint_ = false;
       return print_preview.PrintAttemptResult_.PRINTED;
     },
 
     /**
      * Closes the print preview.
+     * @param {boolean} isCancel Whether this was called due to the user
+     *     closing the dialog without printing.
      * @private
      */
-    close_: function() {
+    close_: function(isCancel) {
       this.exitDocument();
       this.uiState_ = PrintPreviewUiState_.CLOSING;
-      this.nativeLayer_.startCloseDialog();
+      this.nativeLayer_.startCloseDialog(isCancel);
     },
 
     /**
      * Opens the native system print dialog after disabling all controls.
      * @private
      */
     openSystemPrintDialog_: function() {
       if (!this.shouldShowSystemDialogLink_())
         return;
       if ($('system-dialog-link').classList.contains('disabled'))
@@ skipping 80 matching lines @@
       this.destinationStore_.setCloudPrintInterface(this.cloudPrintInterface_);
       this.invitationStore_.setCloudPrintInterface(this.cloudPrintInterface_);
       if (this.destinationSearch_.getIsVisible()) {
         this.destinationStore_.startLoadCloudDestinations();
         this.invitationStore_.startLoadingInvitations();
       }
     },
 
     /**
      * Called from the native layer when ready to print to Google Cloud Print.
-     * @param {Event} event Contains the body to send in the HTTP request.
+     * @param {string} data The body to send in the HTTP request.
      * @private
      */
-    onPrintToCloud_: function(event) {
+    onPrintToCloud_: function(data) {
       assert(
           this.uiState_ == PrintPreviewUiState_.PRINTING,
           'Document ready to be sent to the cloud when not in printing ' +
               'state: ' + this.uiState_);
       assert(
           this.cloudPrintInterface_ != null,
           'Google Cloud Print is not enabled');
       assert(this.destinationStore_.selectedDestination != null);
       this.cloudPrintInterface_.submit(
           this.destinationStore_.selectedDestination, this.printTicketStore_,
-          this.documentInfo_, event.data);
+          this.documentInfo_, data);
     },
 
     /**
      * Called from the native layer when the user cancels the save-to-pdf file
      * selection dialog.
      * @private
      */
     onFileSelectionCancel_: function() {
       assert(
           this.uiState_ == PrintPreviewUiState_.FILE_SELECTION,
@@ skipping 20 matching lines @@
     /**
      * Called after successfully submitting a job to Google Cloud Print.
      * @param {!Event} event Contains the ID of the submitted print job.
      * @private
      */
     onCloudPrintSubmitDone_: function(event) {
       assert(
           this.uiState_ == PrintPreviewUiState_.PRINTING,
           'Submited job to Google Cloud Print but not in printing state ' +
               this.uiState_);
-      this.close_();
+      this.close_(false);
     },
 
     /**
      * Called when there was an error communicating with Google Cloud print.
      * Displays an error message in the print header.
      * @param {!Event} event Contains the error message.
      * @private
      */
     onCloudPrintError_: function(event) {
       if (event.status == 0) {
@@ skipping 74 matching lines @@
           'Trying to print when not in ready state: ' + this.uiState_);
       this.printDocumentOrOpenPdfPreview_(false /*isPdfPreview*/);
     },
 
     /**
      * Called when the print header's cancel button is clicked. Closes the
      * print dialog.
      * @private
      */
     onCancelButtonClick_: function() {
-      this.close_();
+      this.close_(true);
     },
 
     /**
      * Called when the register promo for Cloud Print is clicked.
      * @private
      */
     onCloudPrintRegisterPromoClick_: function(e) {
       var devicesUrl = 'chrome://devices/register?id=' + e.destination.id;
       this.nativeLayer_.startForceOpenNewTab(devicesUrl);
       this.destinationStore_.waitForRegister(e.destination.id);
     },
 
     /**
      * Consume escape key presses and ctrl + shift + p. Delegate everything else
      * to the preview area.
      * @param {KeyboardEvent} e The keyboard event.
      * @private
      * @suppress {uselessCode}
      * Current compiler preprocessor leaves all the code inside all the <if>s,
      * so the compiler claims that code after first return is unreachable.
      */
     onKeyDown_: function(e) {
       // Escape key closes the dialog.
       if (e.keyCode == 27 && !hasKeyModifiers(e)) {
         // On non-mac with toolkit-views, ESC key is handled by C++-side instead
         // of JS-side.
         if (cr.isMac) {
-          this.close_();
+          this.close_(true);
           e.preventDefault();
         }
         return;
       }
 
       // On Mac, Cmd-. should close the print dialog.
       if (cr.isMac && e.keyCode == 190 && e.metaKey) {
-        this.close_();
+        this.close_(true);
         e.preventDefault();
         return;
       }
 
       // Ctrl + Shift + p / Mac equivalent.
       if (e.keyCode == 80) {
         if ((cr.isMac && e.metaKey && e.altKey && !e.shiftKey && !e.ctrlKey) ||
             (!cr.isMac && e.shiftKey && e.ctrlKey && !e.altKey && !e.metaKey)) {
           this.openSystemPrintDialog_();
           e.preventDefault();
@@ skipping 113 matching lines @@
      * @private
      */
     onPageCountReady_: function(event) {
       if (event.fitToPageScaling >= 0) {
         this.scalingSettings_.updateFitToPageScaling(event.fitToPageScaling);
       }
     },
 
     /**
      * Called when printing to a privet or extension printer fails.
-     * @param {number | string} httpError The HTTP error code, or -1 if not an
-     *     HTTP error.
+     * @param {*} httpError The HTTP error code, or -1 or a string describing
+     *     the error, if not an HTTP error.
      * @private
      */
     onPrintFailed_: function(httpError) {
       console.error('Privet printing failed with error code ' + httpError);
       this.printHeader_.setErrorMessage(
           loadTimeData.getString('couldNotPrint'));
     },
 
     /**
      * Called when the print preview settings need to be changed for testing.
@@ skipping 207 matching lines @@
      * Google Cloud Print management page and closes the print preview.
      * @private
      */
     onNoDestinationsPromoClick_: function() {
       new print_preview.GcpPromoMetricsContext().record(
           print_preview.Metrics.GcpPromoBucket.PROMO_CLICKED);
       this.appState_.persistIsGcpPromoDismissed(true);
       window.open(
           this.cloudPrintInterface_.baseUrl +
           '?user=' + this.userInfo_.activeUser + '#printers');
-      this.close_();
+      this.close_(false);
     }
   };
 
   // Export
   return {PrintPreview: PrintPreview};
 });
 
 // Pull in all other scripts in a single shot.
 // <include src="common/overlay.js">
 // <include src="common/search_box.js">
@@ skipping 75 matching lines @@
 // <include src="search/destination_search.js">
 // <include src="search/provisional_destination_resolver.js">
 
 window.addEventListener('DOMContentLoaded', function() {
   var previewWindow = /** @type {{isTest: boolean}} */ (window);
   if (!previewWindow.isTest) {
     var printPreview = new print_preview.PrintPreview();
     printPreview.initialize();
   }
 });