Print Preview: Make print preview tab modal.

chrome/browser/resources/print_preview/print_preview.js

 // Copyright (c) 2011 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.
 
 // require: cr/ui/print_preview_cloud.js
 
 var localStrings = new LocalStrings();
 
 // If useCloudPrint is true we attempt to connect to cloud print
 // and populate the list of printers with cloud print printers.
@@ skipping 153 matching lines @@
 
 /**
  * Disables the controls in the sidebar, shows the throbber and instructs the
  * backend to open the native print dialog.
  */
 function onSystemDialogLinkClicked() {
   if (showingSystemDialog)
     return;
   showingSystemDialog = true;
   disableInputElementsInSidebar();
+  printHeader.disableCancelButton();
   $('system-dialog-throbber').classList.remove('hidden');
   chrome.send('showSystemDialog');
 }
 
 /**
  * Similar to onSystemDialogLinkClicked(), but specific to the
  * 'Launch native print dialog' UI.
  */
 function launchNativePrintDialog() {
   if (showingSystemDialog)
     return;
   showingSystemDialog = true;
   $('error-button').disabled = true;
   printHeader.disableCancelButton();
   $('native-print-dialog-throbber').classList.remove('hidden');
   chrome.send('showSystemDialog');
 }
 
 /**
- * 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() {
   var printerList = $('printer-list');
   var selectedIndex = printerList.selectedIndex;
   if (selectedIndex < 0)
     return;
   var skip_refresh = false;
   var selectedValue = printerList.options[selectedIndex].value;
   if (cloudprint.isCloudPrint(printerList.options[selectedIndex])) {
@@ skipping 288 matching lines @@
   chrome.send('getPreview', [JSON.stringify(getSettingsWithRequestID()),
                              pageCount,
                              previewModifiable]);
 }
 
 /**
  * Called from PrintPreviewUI::OnFileSelectionCancelled to notify the print
  * preview tab regarding the file selection cancel event.
  */
 function fileSelectionCancelled() {
-  // TODO(thestig) re-enable controls here.
+  printHeader.enableCancelButton();
 }
 
 /**
  * Called from PrintPreviewUI::OnFileSelectionCompleted to notify the print
  * preview tab regarding the file selection completed event.
  */
 function fileSelectionCompleted() {
   // If the file selection is completed and the tab is not already closed it
   // means that a pending print to pdf request exists.
   disableInputElementsInSidebar();
@@ skipping 528 matching lines @@
   if (initiatorTabTitle == '')
     return;
   document.title = localStrings.getStringF(
       'printPreviewTitleFormat', initiatorTabTitle);
 }
 
 /**
  * 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.

 }
 
 /**
   * Handle keyboard events.
   * @param {KeyboardEvent} e The keyboard event.
   */
 function onKeyDown(e) {
   // Escape key closes the dialog.
   if (e.keyCode == 27 && !e.shiftKey && !e.ctrlKey && !e.altKey && !e.metaKey) {
     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);
 window.onkeydown = onKeyDown;
 
 /// Pull in all other scripts in a single shot.
 <include src="print_preview_animations.js"/>
 <include src="print_preview_cloud.js"/>
 <include src="print_preview_utils.js"/>
 <include src="print_header.js"/>
 <include src="page_settings.js"/>
 <include src="copies_settings.js"/>
 <include src="header_footer_settings.js"/>
 <include src="layout_settings.js"/>
 <include src="color_settings.js"/>
 <include src="margin_settings.js"/>
 <include src="margin_textbox.js"/>
 <include src="margin_line.js"/>
 <include src="margin_utils.js"/>
 <include src="margins_ui.js"/>
 <include src="preview_area.js"/>