Print Preview: Make print preview tab modal. (try 2)

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 188 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').hidden = false;
   chrome.send('showSystemDialog');
 }
 
 /**
  * Similar to onSystemDialogLinkClicked(), but specific to the
  * 'Launch native print dialog' UI.
  */
 function launchNativePrintDialog() {
   if (showingSystemDialog)
     return;
   showingSystemDialog = true;
   previewArea.errorButton.disabled = true;
   printHeader.disableCancelButton();
   $('native-print-dialog-throbber').hidden = false;
   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) {
-    previewArea.displayErrorMessageWithButtonAndNotify(
-        localStrings.getString('initiatorTabCrashed'),
-        localStrings.getString('reopenPage'),
-        function() { chrome.send('reloadCrashedInitiatorTab'); });
-  } else {
-    previewArea.displayErrorMessageAndNotify(
-        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) {
-    previewArea.displayErrorMessageWithButtonAndNotify(
-        localStrings.getString('initiatorTabClosed'),
-        localStrings.getString('reopenPage'),
-        function() { window.location = initiatorTabURL; });
-  } else {
-    previewArea.displayErrorMessageAndNotify(
-        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 58 matching lines @@
  * capabilities of the currently selected printer. It is called from C++ too.
  * @param {Object} settingInfo printer setting information.
  */
 function updateWithPrinterCapabilities(settingInfo) {
   var customEvent = new cr.Event(customEvents.PRINTER_CAPABILITIES_UPDATED);
   customEvent.printerCapabilities = settingInfo;
   document.dispatchEvent(customEvent);
 }
 
 /**
+ * Reloads the printer list.
+ */
+function reloadPrintersList() {
+  $('printer-list').length = 0;
+  firstCloudPrintOptionPos = 0;
+  lastCloudPrintOptionPos = 0;
+  chrome.send('getPrinters');
+}
+
+/**
  * Turn on the integration of Cloud Print.
  * @param {string} cloudPrintUrl The URL to use for cloud print servers.
  */
 function setUseCloudPrint(cloudPrintURL) {
   useCloudPrint = true;
   cloudprint.setBaseURL(cloudPrintURL);
 }
 
 /**
  * Take the PDF data handed to us and submit it to the cloud, closing the print
  * preview tab once the upload is successful.
  * @param {string} data Data to send as the print job.
  */
 function printToCloud(data) {
   cloudprint.printToCloud(data, finishedCloudPrinting);
 }
 
 /**
  * Cloud print upload of the PDF file is finished, time to close the dialog.
  */
 function finishedCloudPrinting() {
-  window.location = cloudprint.getBaseURL();
+  closePrintPreviewTab();
 }
 
 /**
  * Checks whether the specified settings are valid.
  *
  * @return {boolean} true if settings are valid, false if not.
  */
 function areSettingsValid() {
   var selectedPrinter = getSelectedPrinterName();
   return pageSettings.isPageSelectionValid() &&
@@ skipping 197 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 20 matching lines @@
     } else {
       $('printer-list')[0].value = defaultOrLastUsedPrinterName;
       updateControlsWithSelectedPrinterCapabilities();
     }
   }
   chrome.send('getPrinters');
 }
 
 /**
  * Fill the printer list drop down.
- * Called from PrintPreviewHandler::SendPrinterList().
+ * Called from PrintPreviewHandler::SetupPrinterList().
  * @param {Array} printers Array of printer info objects.
  */
 function setPrinters(printers) {
   var printerList = $('printer-list');
   // Remove empty entry added by setDefaultPrinter.
   if (printerList[0] && printerList[0].textContent == '')
     printerList.remove(0);
   for (var i = 0; i < printers.length; ++i) {
     var isDefault = (printers[i].deviceName == defaultOrLastUsedPrinterName);
     addDestinationListOption(printers[i].printerName, printers[i].deviceName,
@@ skipping 445 matching lines @@
     return;
   document.title = localStrings.getStringF(
       'printPreviewTitleFormat', initiatorTabTitle);
 }
 
 /**
  * Closes this print preview tab.
  */
 function closePrintPreviewTab() {
   chrome.send('closePrintPreviewTab');
+  chrome.send('DialogClose');
 }
 
 /**
   * 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) {
+    if ((cr.isMac && e.metaKey && e.altKey && !e.shiftKey && !e.ctrlKey) ||
+        (!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_utils.js"/>
 <include src="margins_ui.js"/>
 <include src="margins_ui_pair.js"/>
 <include src="preview_area.js"/>