| Index: chrome/browser/resources/print_preview/native_layer.js
|
| diff --git a/chrome/browser/resources/print_preview/native_layer.js b/chrome/browser/resources/print_preview/native_layer.js
|
| index 1a2b0e60447bbd74e697511500661edee9aab45a..e5a07a7202877f7e1f7eb533133284da8c0d5f16 100644
|
| --- a/chrome/browser/resources/print_preview/native_layer.js
|
| +++ b/chrome/browser/resources/print_preview/native_layer.js
|
| @@ -88,13 +88,10 @@ cr.define('print_preview', function() {
|
| // Bind global handlers
|
| global.setUseCloudPrint = this.onSetUseCloudPrint_.bind(this);
|
| global.reloadPrintersList = this.onReloadPrintersList_.bind(this);
|
| - global.printPreviewFailed = this.onPrintPreviewFailed_.bind(this);
|
| - global.invalidPrinterSettings = this.onInvalidPrinterSettings_.bind(this);
|
| global.onDidGetDefaultPageLayout =
|
| this.onDidGetDefaultPageLayout_.bind(this);
|
| global.onDidGetPreviewPageCount = this.onDidGetPreviewPageCount_.bind(this);
|
| global.onDidPreviewPage = this.onDidPreviewPage_.bind(this);
|
| - global.updatePrintPreview = this.onUpdatePrintPreview_.bind(this);
|
| global.onEnableManipulateSettingsForTest =
|
| this.onEnableManipulateSettingsForTest_.bind(this);
|
| global.printPresetOptionsFromDocument =
|
| @@ -332,8 +329,10 @@ cr.define('print_preview', function() {
|
| * @param {!print_preview.DocumentInfo} documentInfo Document data model.
|
| * @param {boolean} generateDraft Tell the renderer to re-render.
|
| * @param {number} requestId ID of the preview request.
|
| + * @return {!Promise<number>} Promise that resolves with the unique ID of
|
| + * the preview UI when the preview has been generated.
|
| */
|
| - startGetPreview: function(
|
| + getPreview: function(
|
| destination, printTicketStore, documentInfo, generateDraft, requestId) {
|
| assert(
|
| printTicketStore.isTicketValidForPreview(),
|
| @@ -396,9 +395,9 @@ cr.define('print_preview', function() {
|
| };
|
| }
|
|
|
| - chrome.send('getPreview', [
|
| - JSON.stringify(ticket), requestId > 0 ? documentInfo.pageCount : -1
|
| - ]);
|
| + return cr.sendWithPromise(
|
| + 'getPreview', JSON.stringify(ticket),
|
| + requestId > 0 ? documentInfo.pageCount : -1);
|
| },
|
|
|
| /**
|
| @@ -574,26 +573,6 @@ cr.define('print_preview', function() {
|
| this.eventTarget_, NativeLayer.EventType.DESTINATIONS_RELOAD);
|
| },
|
|
|
| - /**
|
| - * Display an error message when print preview fails.
|
| - * Called from PrintPreviewMessageHandler::OnPrintPreviewFailed().
|
| - * @private
|
| - */
|
| - onPrintPreviewFailed_: function() {
|
| - cr.dispatchSimpleEvent(
|
| - this.eventTarget_, NativeLayer.EventType.PREVIEW_GENERATION_FAIL);
|
| - },
|
| -
|
| - /**
|
| - * Display an error message when encountered invalid printer settings.
|
| - * Called from PrintPreviewMessageHandler::OnInvalidPrinterSettings().
|
| - * @private
|
| - */
|
| - onInvalidPrinterSettings_: function() {
|
| - cr.dispatchSimpleEvent(
|
| - this.eventTarget_, NativeLayer.EventType.SETTINGS_INVALID);
|
| - },
|
| -
|
| /**
|
| * @param {{contentWidth: number, contentHeight: number, marginLeft: number,
|
| * marginRight: number, marginTop: number, marginBottom: number,
|
| @@ -651,23 +630,6 @@ cr.define('print_preview', function() {
|
| this.eventTarget_.dispatchEvent(pagePreviewGenEvent);
|
| },
|
|
|
| - /**
|
| - * Update the print preview when new preview data is available.
|
| - * Create the PDF plugin as needed.
|
| - * Called from PrintPreviewUI::PreviewDataIsAvailable().
|
| - * @param {number} previewUid Preview unique identifier.
|
| - * @param {number} previewResponseId The preview request id that resulted in
|
| - * this response.
|
| - * @private
|
| - */
|
| - onUpdatePrintPreview_: function(previewUid, previewResponseId) {
|
| - var previewGenDoneEvent =
|
| - new Event(NativeLayer.EventType.PREVIEW_GENERATION_DONE);
|
| - previewGenDoneEvent.previewUid = previewUid;
|
| - previewGenDoneEvent.previewResponseId = previewResponseId;
|
| - this.eventTarget_.dispatchEvent(previewGenDoneEvent);
|
| - },
|
| -
|
| /**
|
| * Updates print preset options from source PDF document.
|
| * Called from PrintPreviewUI::OnSetOptionsFromDocument().
|
|
|