Print Preview: Remove global onPrivetPrintFailed

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 323 matching lines @@
     /** Sets up the page and print preview by getting the printer list. */
     initialize: function() {
       this.decorate($('print-preview'));
       if (!this.previewArea_.hasCompatiblePlugin) {
         this.setIsEnabled_(false);
       }
       this.nativeLayer_.getInitialSettings().then(
           this.onInitialSettingsSet_.bind(this));
       print_preview.PrintPreviewFocusManager.getInstance().initialize();
       cr.ui.FocusOutlineManager.forDocument(document);
+      cr.addWebUIListener('print-failed',

[dpapad, 2017/06/14 20:52:45]

I think that we need to remove this listener in exitDocument method (see example
where exitDocument is overriden at
https://cs.chromium.org/chromium/src/chrome/browser/resources/print_preview/c...),
to be safe.

This could be a problem during tests, if we ever destroy a PrintPreview instance
and create a new one, where both old and new would have an active listener. You
can find an example of how to delete a WebUI listener at
https://cs.chromium.org/chromium/src/ui/webui/resources/js/web_ui_listener_be...
(unfortunately can't reuse that code, since "behavior" is a Polymer concept.

[rbpotter, 2017/06/14 22:52:55]

Done.

+                          this.onPrintFailed_.bind(this));
     },
 
     /** @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));
@@ skipping 16 matching lines @@
       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));
       this.tracker.add(
           nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.PRIVET_PRINT_FAILED,
-          this.onPrivetPrintFailed_.bind(this));
-      this.tracker.add(
-          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.MANIPULATE_SETTINGS_FOR_TEST,
           this.onManipulateSettingsForTest_.bind(this));
 
       if ($('system-dialog-link')) {
         this.tracker.add(
             getRequiredElement('system-dialog-link'),
             'click',
             this.openSystemPrintDialog_.bind(this));
       }
       if ($('open-pdf-in-preview-link')) {
@@ skipping 632 matching lines @@
      * @private
      */
     onPageCountReady_: function(event) {
       if (event.fitToPageScaling >= 0) {
         this.scalingSettings_.updateFitToPageScaling(
               event.fitToPageScaling);
       }
     },
 
     /**
-     * Called when privet printing fails.
-     * @param {Event} event Event object representing the failure.
+     * 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.
      * @private
      */
-    onPrivetPrintFailed_: function(event) {
-      console.error('Privet printing failed with error code ' +
-                    event.httpError);
+    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.
      * @param {Event} event Event object that contains the option that is to
      *     be changed and what to set that option.
      * @private
      */
@@ skipping 301 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();
   }
 });