Merge 147143 - Makes dialog print on ENTER key press.

chrome/browser/resources/print_preview/print_header.js

Index: chrome/browser/resources/print_preview/print_header.js
===================================================================
--- chrome/browser/resources/print_preview/print_header.js	(revision 147897)
+++ chrome/browser/resources/print_preview/print_header.js	(working copy)
@@ -69,6 +69,7 @@
       this.cancelButton_.disabled = !isEnabled;
     },
 
+    /** @param {string} message Error message to display in the print header. */
     setErrorMessage: function(message) {
       var summaryEl = this.getElement().getElementsByClassName(
           PrintHeader.Classes_.SUMMARY)[0];
@@ -79,7 +80,6 @@
     /** @override */
     enterDocument: function() {
       print_preview.Component.prototype.enterDocument.call(this);
-      this.printButton_.focus();
 
       // User events
       this.tracker.add(
@@ -220,6 +220,7 @@
       } else {
         this.printButton_.textContent = localStrings.getString('printButton');
       }
+      this.printButton_.focus();
     },
 
     /**
@@ -232,6 +233,10 @@
           !this.printTicketStore_.isTicketValid() ||
           !this.isEnabled_;
       this.updateSummary_();
+      if (document.activeElement == null ||
+          document.activeElement == document.body) {
+        this.printButton_.focus();
+      }
     }
   };