Print Preview: Use cr.sendWithPromise for getInitialSettings

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 313 matching lines @@
 
   PrintPreview.prototype = {
     __proto__: print_preview.Component.prototype,
 
     /** 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_.startGetInitialSettings();
+      this.nativeLayer_.getInitialSettings().then(
+          this.onInitialSettingsSet_.bind(this));
       print_preview.PrintPreviewFocusManager.getInstance().initialize();
       cr.ui.FocusOutlineManager.forDocument(document);
     },
 
     /** @override */
     enterDocument: function() {
       // Native layer events.
+      var nativeLayerEventTarget = this.nativeLayer_.getEventTarget();
       this.tracker.add(
-          this.nativeLayer_,
-          print_preview.NativeLayer.EventType.INITIAL_SETTINGS_SET,
-          this.onInitialSettingsSet_.bind(this));
-      this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.CLOUD_PRINT_ENABLE,
           this.onCloudPrintEnable_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.PRINT_TO_CLOUD,
           this.onPrintToCloud_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.FILE_SELECTION_CANCEL,
           this.onFileSelectionCancel_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.FILE_SELECTION_COMPLETE,
           this.onFileSelectionComplete_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.SETTINGS_INVALID,
           this.onSettingsInvalid_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.PRINT_PRESET_OPTIONS,
           this.onPrintPresetOptionsFromDocument_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.PAGE_COUNT_READY,
           this.onPageCountReady_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.PRIVET_PRINT_FAILED,
           this.onPrivetPrintFailed_.bind(this));
       this.tracker.add(
-          this.nativeLayer_,
+          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 241 matching lines @@
       setIsVisible(getRequiredElement('system-dialog-throbber'), true);
       this.setIsEnabled_(false);
       this.uiState_ = PrintPreviewUiState_.OPENING_NATIVE_PRINT_DIALOG;
       this.nativeLayer_.startShowSystemDialog();
     },
 
     /**
      * Called when the native layer has initial settings to set. Sets the
      * initial settings of the print preview and begins fetching print
      * destinations.
-     * @param {Event} event Contains the initial print preview settings
-     *     persisted through the session.
+     * @param {!print_preview.NativeInitialSettings} settings The initial print
+     *     preview settings persisted through the session.
      * @private
      */
-    onInitialSettingsSet_: function(event) {
+    onInitialSettingsSet_: function(settings) {
       assert(this.uiState_ == PrintPreviewUiState_.INITIALIZING,
-             'Updating initial settings when not in initializing state: ' +
-                 this.uiState_);
+             'Updating initial settings when not in initializing ' +
+                 'state: ' + this.uiState_);

[dpapad, 2017/05/19 02:07:06]

Can you revert this line completely? It seems that "state: " can fit in previous
line (as it was before).

[rbpotter, 2017/05/19 02:25:38]

Done.

       this.uiState_ = PrintPreviewUiState_.READY;
 
-      var settings = event.initialSettings;
       this.isInKioskAutoPrintMode_ = settings.isInKioskAutoPrintMode;
       this.isInAppKioskMode_ = settings.isInAppKioskMode;
 
       // The following components must be initialized in this order.
       this.appState_.init(settings.serializedAppStateStr);
       this.documentInfo_.init(
           settings.isDocumentModifiable,
           settings.documentTitle,
           settings.documentHasSelection);
       this.printTicketStore_.init(
@@ skipping 682 matching lines @@
 // <include src="previewarea/preview_area.js">
 // <include src="preview_generator.js">
 
 // <include src="search/destination_list.js">
 // <include src="search/cloud_destination_list.js">
 // <include src="search/recent_destination_list.js">
 // <include src="search/destination_list_item.js">
 // <include src="search/destination_search.js">
 // <include src="search/provisional_destination_resolver.js">
 
-/**
- * Global instance of PrintPreview, used by browser tests.
- * @type {print_preview.PrintPreview}
- */
-var printPreview;
 window.addEventListener('DOMContentLoaded', function() {
-  printPreview = new print_preview.PrintPreview();
-  printPreview.initialize();
+  var previewWindow = /** @type {{isTest: boolean}} */ (window);
+  if (!previewWindow.isTest) {
+    var printPreview = new print_preview.PrintPreview();
+    printPreview.initialize();
+  }
 });