Print Preview: Make print preview tab modal.

chrome/browser/resources/print_preview/print_preview.js

Index: chrome/browser/resources/print_preview/print_preview.js
===================================================================
--- chrome/browser/resources/print_preview/print_preview.js	(revision 105366)
+++ chrome/browser/resources/print_preview/print_preview.js	(working copy)
@@ -171,6 +171,7 @@
     return;
   showingSystemDialog = true;
   disableInputElementsInSidebar();
+  printHeader.disableCancelButton();
   $('system-dialog-throbber').classList.remove('hidden');
   chrome.send('showSystemDialog');
 }
@@ -190,40 +191,6 @@
 }
 
 /**
- * Disables the controls which need the initiator tab to generate preview
- * data. This function is called when the initiator tab has crashed.
- * @param {string} initiatorTabURL The URL of the initiator tab.
- */
-function onInitiatorTabCrashed(initiatorTabURL) {
-  disableInputElementsInSidebar();
-  if (initiatorTabURL) {
-    displayErrorMessageWithButton(
-        localStrings.getString('initiatorTabCrashed'),
-        localStrings.getString('reopenPage'),
-        function() { chrome.send('reloadCrashedInitiatorTab'); });
-  } else {
-    displayErrorMessage(localStrings.getString('initiatorTabCrashed'));
-  }
-}
-
-/**
- * Disables the controls which need the initiator tab to generate preview
- * data. This function is called when the initiator tab is closed.
- * @param {string} initiatorTabURL The URL of the initiator tab.
- */
-function onInitiatorTabClosed(initiatorTabURL) {
-  disableInputElementsInSidebar();
-  if (initiatorTabURL) {
-    displayErrorMessageWithButton(
-        localStrings.getString('initiatorTabClosed'),
-        localStrings.getString('reopenPage'),
-        function() { window.location = initiatorTabURL; });
-  } else {
-    displayErrorMessage(localStrings.getString('initiatorTabClosed'));
-  }
-}
-
-/**
  * Gets the selected printer capabilities and updates the controls accordingly.
  */
 function updateControlsWithSelectedPrinterCapabilities() {
@@ -532,7 +499,7 @@
  * preview tab regarding the file selection cancel event.
  */
 function fileSelectionCancelled() {
-  // TODO(thestig) re-enable controls here.
+  printHeader.enableCancelButton();
 }
 
 /**
@@ -1081,7 +1048,7 @@
  * Closes this print preview tab.
  */
 function closePrintPreviewTab() {
-  chrome.send('closePrintPreviewTab');
+  chrome.send('DialogClose', []);

[kmadhusu, 2011/10/14 00:21:09]

You can do "chrome.send('DialogClose');". Any specific reason for passing an
empty array?

[Lei Zhang, 2011/10/14 20:31:27]

Done. Copy/pasted from elsewhere I think.

 }
 
 /**
@@ -1094,6 +1061,13 @@
     printHeader.disableCancelButton();
     closePrintPreviewTab();
   }
+  if (e.keyCode == 80 || e.keyCode == 112) {

[kmadhusu, 2011/10/14 00:21:09]

keycode 112 check is not required.

[Lei Zhang, 2011/10/14 20:31:27]

Done.

+    if ((cr.isMac && e.shiftKey && e.metaKey && !e.ctrlKey && !e.altKey) ||
+        (!cr.isMac && e.shiftKey && e.ctrlKey && !e.altKey && !e.metaKey)) {
+      window.onkeydown = null;
+      onSystemDialogLinkClicked();
+    }
+  }
 }
 
 window.addEventListener('DOMContentLoaded', onLoad);