diff options
| author | abodenha@google.com <abodenha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 21:10:51 +0000 |
|---|---|---|
| committer | abodenha@google.com <abodenha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 21:10:51 +0000 |
| commit | 940b90ec6937bfb5c42ef3cd658068b132d27de9 (patch) | |
| tree | e9e98e48e9e16200e82b3269730f3bda439b2d4b | |
| parent | 0a60e59a19c4b199b380e23dec7aa040c14f2d49 (diff) | |
| download | chromium_src-940b90ec6937bfb5c42ef3cd658068b132d27de9.zip chromium_src-940b90ec6937bfb5c42ef3cd658068b132d27de9.tar.gz chromium_src-940b90ec6937bfb5c42ef3cd658068b132d27de9.tar.bz2 | |
Merge 115173 - Fix crash in print preview on chrome os.
Wait for PDF to be generated before showing the GCP dialog.
BUG=http://code.google.com/p/chromium-os/issues/detail?id=24350
TEST=Open a web page that will take a long time to render the preview. Open print-preview. Select "Search for additional printers" from the printer selection before the preview completes. The GCP dialog should show and no crash should happen.
Review URL: http://codereview.chromium.org/9008014
TBR=abodenha@chromium.org
Review URL: http://codereview.chromium.org/9018028
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115400 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/print_preview/print_preview.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js index 8ed968c..f836f44 100644 --- a/chrome/browser/resources/print_preview/print_preview.js +++ b/chrome/browser/resources/print_preview/print_preview.js @@ -289,7 +289,7 @@ function updateControlsWithSelectedPrinterCapabilities() { 'printerDefaultDuplexValue': copiesSettings.UNKNOWN_DUPLEX_MODE, 'disableCopiesOption': true}); if (cr.isChromeOS && selectedValue == PRINT_WITH_CLOUD_PRINT) - sendPrintDocumentRequest(); + requestToPrintDocument(); } else { // This message will call back to 'updateWithPrinterCapabilities' // function. |