Print Preview: Hiding margins UI if an error occurs.

chrome/browser/resources/print_preview/print_preview.js

Index: chrome/browser/resources/print_preview/print_preview.js
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js
index 9f962abec5b420cbe049b4ac659fe042ccadac82..a4a022627605c0f9fd708f49769198b33b523985 100644
--- a/chrome/browser/resources/print_preview/print_preview.js
+++ b/chrome/browser/resources/print_preview/print_preview.js
@@ -114,6 +114,7 @@ function onLoad() {
 
   previewArea = print_preview.PreviewArea.getInstance();
   printHeader = print_preview.PrintHeader.getInstance();
+  addEventListeners();
 
   if (!checkCompatiblePluginExists()) {
     disableInputElementsInSidebar();
@@ -121,7 +122,6 @@ function onLoad() {
         localStrings.getString('noPlugin'),
         localStrings.getString('launchNativeDialog'),
         launchNativePrintDialog);
-    cancelPendingPrintRequest();
     $('mainview').parentElement.removeChild($('dummy-viewer'));
     return;
   }
@@ -145,6 +145,20 @@ function onLoad() {
 }
 
 /**
+ * Adds event listeners for various events.
+ */
+function addEventListeners() {
+  document.addEventListener('errorOccurred', onErrorOccurred);

[Evan Stade, 2011/10/19 22:34:11]

why does this have its own helper function? at this point I'd inline it as it's
only one line and only move to a helper if it's like 20 lines

[dpapad, 2011/10/19 22:56:21]

Done.

+}
+
+/**
+ * Executes when an 'errorOccurred' event occurs.
+ */
+function onErrorOccurred() {

[Evan Stade, 2011/10/19 22:34:11]

likewise, move the body of cancelpendingprintrequest here

[dpapad, 2011/10/19 22:56:21]

Done.

+  cancelPendingPrintRequest();
+}
+
+/**
  * Disables the input elements in the sidebar.
  */
 function disableInputElementsInSidebar() {
@@ -195,11 +209,9 @@ function onInitiatorTabCrashed(initiatorTabURL) {
         localStrings.getString('initiatorTabCrashed'),
         localStrings.getString('reopenPage'),
         function() { chrome.send('reloadCrashedInitiatorTab'); });
-    cancelPendingPrintRequest();
   } else {
     previewArea.displayErrorMessage(
         localStrings.getString('initiatorTabCrashed'));
-    cancelPendingPrintRequest();
   }
 }
 
@@ -215,11 +227,9 @@ function onInitiatorTabClosed(initiatorTabURL) {
         localStrings.getString('initiatorTabClosed'),
         localStrings.getString('reopenPage'),
         function() { window.location = initiatorTabURL; });
-    cancelPendingPrintRequest();
   } else {
     previewArea.displayErrorMessage(
         localStrings.getString('initiatorTabClosed'));
-    cancelPendingPrintRequest();
   }
 }
 
@@ -718,7 +728,6 @@ function printPreviewFailed() {
       localStrings.getString('previewFailed'),
       localStrings.getString('launchNativeDialog'),
       launchNativePrintDialog);
-  cancelPendingPrintRequest();
 }
 
 /**
@@ -728,7 +737,6 @@ function printPreviewFailed() {
 function invalidPrinterSettings() {
   previewArea.displayErrorMessage(
       localStrings.getString('invalidPrinterSettings'));
-  cancelPendingPrintRequest();
 }
 
 /**