Index: chrome/browser/resources/print_preview/print_preview.js |
=================================================================== |
--- chrome/browser/resources/print_preview/print_preview.js (revision 105275) |
+++ 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() { |
@@ -1079,7 +1046,7 @@ |
* Closes this print preview tab. |
*/ |
function closePrintPreviewTab() { |
- chrome.send('closePrintPreviewTab'); |
+ chrome.send('DialogClose', []); |
} |
/** |
@@ -1092,6 +1059,13 @@ |
printHeader.disableCancelButton(); |
closePrintPreviewTab(); |
} |
+ if (e.keyCode == 80 || e.keyCode == 112) { |
+ if ((cr.isMac && e.shiftKey && e.metaKey && !e.ctrlKey && !e.altKey) || |
kmadhusu
2011/10/13 18:52:18
Why do you need this? If we press the key combinat
Lei Zhang
2011/10/13 21:12:12
When the constrained window has focus, the browser
|
+ (!cr.isMac && e.shiftKey && e.ctrlKey && !e.altKey && !e.metaKey)) { |
+ window.onkeydown = null; |
+ onSystemDialogLinkClicked(); |
+ } |
+ } |
} |
window.addEventListener('DOMContentLoaded', onLoad); |