Print Preview: Fix followup issues for removing global JS functions

chrome/browser/resources/print_preview/preview_generator.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('print_preview', function() {
   'use strict';
 
   /**
    * Interface to the Chromium print preview generator.
    * @param {!print_preview.DestinationStore} destinationStore Used to get the
    *     currently selected destination.
    * @param {!print_preview.PrintTicketStore} printTicketStore Used to read the
    *     state of the ticket and write document information.
    * @param {!print_preview.NativeLayer} nativeLayer Used to communicate to
    *     Chromium's preview rendering system.
    * @param {!print_preview.DocumentInfo} documentInfo Document data model.
+   * @param {!WebUIListenerTracker} listenerTracker Tracker for the WebUI
+   *     listeners added in the PreviewGenerator constructor.
    * @constructor
    * @extends {cr.EventTarget}
    */
   function PreviewGenerator(
-      destinationStore, printTicketStore, nativeLayer, documentInfo) {
+      destinationStore, printTicketStore, nativeLayer, documentInfo,
+      listenerTracker) {
     cr.EventTarget.call(this);
 
     /**
      * Used to get the currently selected destination.
      * @type {!print_preview.DestinationStore}
      * @private
      */
     this.destinationStore_ = destinationStore;
 
     /**
@@ skipping 96 matching lines @@
      * @private
      */
     this.isCssBackgroundEnabled_ = false;
 
     /**
      * Destination that was selected for the last preview.
      * @type {print_preview.Destination}
      * @private
      */
     this.selectedDestination_ = null;
+
+    this.addWebUIEventListeners_(listenerTracker);
   }
 
   /**
    * Event types dispatched by the preview generator.
    * @enum {string}
    */
   PreviewGenerator.EventType = {
     // Dispatched when the document can be printed.
     DOCUMENT_READY: 'print_preview.PreviewGenerator.DOCUMENT_READY',
 
@@ skipping 11 matching lines @@
   };
 
   PreviewGenerator.prototype = {
     __proto__: cr.EventTarget.prototype,
 
     /**
      * Starts listening for relevant WebUI events and adds the listeners to
      * |listenerTracker|. |listenerTracker| is responsible for removing the
      * listeners when necessary.
      * @param {!WebUIListenerTracker} listenerTracker
+     * @private
      */
-    addWebUIEventListeners: function(listenerTracker) {
+    addWebUIEventListeners_: function(listenerTracker) {
       listenerTracker.add(
           'page-count-ready', this.onPageCountReady_.bind(this));
       listenerTracker.add(
           'page-layout-ready', this.onPageLayoutReady_.bind(this));
       listenerTracker.add(
           'page-preview-ready', this.onPagePreviewReady_.bind(this));
     },
 
     /**
      * Request that new preview be generated. A preview request will not be
@@ skipping 231 matching lines @@
     onPreviewGenerationFail_: function() {
       // NOTE: No request ID is returned from Chromium so its assumed its the
       // current one.
       cr.dispatchSimpleEvent(this, PreviewGenerator.EventType.FAIL);
     }
   };
 
   // Export
   return {PreviewGenerator: PreviewGenerator};
 });