1 files changed, 30 insertions, 17 deletions

diff --git a/chromium/chrome/browser/resources/print_preview/print_preview.js b/chromium/chrome/browser/resources/print_preview/print_preview.js
index 673b8d89ef1..cb2434132c1 100644
--- a/chromium/chrome/browser/resources/print_preview/print_preview.js
+++ b/chromium/chrome/browser/resources/print_preview/print_preview.js
@@ -347,8 +347,8 @@ cr.define('print_preview', function() {
           this.onSettingsInvalid_.bind(this));
       this.tracker.add(
           this.nativeLayer_,
-          print_preview.NativeLayer.EventType.DISABLE_SCALING,
-          this.onDisableScaling_.bind(this));
+          print_preview.NativeLayer.EventType.PRINT_PRESET_OPTIONS,
+          this.onPrintPresetOptionsFromDocument_.bind(this));
       this.tracker.add(
           this.nativeLayer_,
           print_preview.NativeLayer.EventType.PRIVET_PRINT_FAILED,
@@ -412,6 +412,7 @@ cr.define('print_preview', function() {
           this.onCancelButtonClick_.bind(this));
 
       this.tracker.add(window, 'keydown', this.onKeyDown_.bind(this));
+      this.previewArea_.setPluginKeyEventCallback(this.onKeyDown_.bind(this));
 
       this.tracker.add(
           this.destinationSettings_,
@@ -528,6 +529,7 @@ cr.define('print_preview', function() {
               PrintPreview.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_ == PrintPreview.UiState_.OPENING_PDF_PREVIEW) {
@@ -870,15 +872,12 @@ cr.define('print_preview', function() {
       // Escape key closes the dialog.
       if (e.keyCode == 27 && !e.shiftKey && !e.ctrlKey && !e.altKey &&
           !e.metaKey) {
-<if expr="toolkit_views">
-        // On the toolkit_views environment, ESC key is handled by C++-side
-        // instead of JS-side.
-        return;
-</if>
-<if expr="not toolkit_views">
-        this.close_();
-</if>
-        e.preventDefault();
+        // On non-mac with toolkit-views, ESC key is handled by C++-side instead
+        // of JS-side.
+        if (cr.isMac) {
+          this.close_();
+          e.preventDefault();
+        }
         return;
       }
 
@@ -955,7 +954,7 @@ cr.define('print_preview', function() {
      * @private
      */
     onManageCloudDestinationsActivated_: function() {
-      this.nativeLayer_.startManageCloudDestinations();
+      this.nativeLayer_.startManageCloudDestinations(this.userInfo_.activeUser);
     },
 
     /**
@@ -979,13 +978,27 @@ cr.define('print_preview', function() {
     },
 
     /**
-     * Called when the native layer dispatches a DISABLE_SCALING event. Resets
-     * fit-to-page selection and updates document info.
+     * Updates printing options according to source document presets.
+     * @param {Event} event Contains options from source document.
      * @private
      */
-    onDisableScaling_: function() {
-      this.printTicketStore_.fitToPage.updateValue(null);
-      this.documentInfo_.updateIsScalingDisabled(true);
+    onPrintPresetOptionsFromDocument_: function(event) {
+      if (event.optionsFromDocument.disableScaling) {
+        this.printTicketStore_.fitToPage.updateValue(null);
+        this.documentInfo_.updateIsScalingDisabled(true);
+      }
+
+      if (event.optionsFromDocument.copies > 0 &&
+          this.printTicketStore_.copies.isCapabilityAvailable()) {
+        this.printTicketStore_.copies.updateValue(
+            event.optionsFromDocument.copies);
+      }
+
+      if (event.optionsFromDocument.duplex >= 0 &&
+          this.printTicketStore_.duplex.isCapabilityAvailable()) {
+        this.printTicketStore_.duplex.updateValue(
+            event.optionsFromDocument.duplex);
+      }
     },
 
     /**