diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 08:52:35 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 08:52:35 +0000 |
| commit | b63d9af0ef8114cb86c47158c192ae981c024066 (patch) | |
| tree | f45ce340fc055707a969215ecd7e484716d87702 | |
| parent | 739881f214ea8e0ce57636f8563d3dd9f59dcc4e (diff) | |
| download | chromium_src-b63d9af0ef8114cb86c47158c192ae981c024066.zip chromium_src-b63d9af0ef8114cb86c47158c192ae981c024066.tar.gz chromium_src-b63d9af0ef8114cb86c47158c192ae981c024066.tar.bz2 | |
Make Privet Printing work on Windows.
Printing context need to know that it's Privet local printing to generate preview.
BUG=318373
Review URL: https://codereview.chromium.org/77023003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236211 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/print_preview/native_layer.js | 1 | ||||
| -rw-r--r-- | printing/printing_context.cc | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/resources/print_preview/native_layer.js b/chrome/browser/resources/print_preview/native_layer.js index 112b573..3ff8a9c 100644 --- a/chrome/browser/resources/print_preview/native_layer.js +++ b/chrome/browser/resources/print_preview/native_layer.js @@ -200,6 +200,7 @@ cr.define('print_preview', function() { destination.id == print_preview.Destination.GooglePromotedId.SAVE_AS_PDF, 'printWithCloudPrint': destination != null && !destination.isLocal, + 'printWithPrivet': destination.isPrivet, 'deviceName': destination == null ? 'foo' : destination.id, 'generateDraftData': documentInfo.isModifiable, 'fitToPageEnabled': printTicketStore.fitToPage.getValue(), diff --git a/printing/printing_context.cc b/printing/printing_context.cc index 40342e9..e452fd0 100644 --- a/printing/printing_context.cc +++ b/printing/printing_context.cc @@ -60,9 +60,11 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings( bool print_to_pdf = false; bool is_cloud_dialog = false; + bool print_with_privet = false; if (!job_settings.GetBoolean(kSettingPrintToPDF, &print_to_pdf) || - !job_settings.GetBoolean(kSettingCloudPrintDialog, &is_cloud_dialog)) { + !job_settings.GetBoolean(kSettingCloudPrintDialog, &is_cloud_dialog) || + !job_settings.GetBoolean(kSettingPrintWithPrivet, &print_with_privet)) { NOTREACHED(); return OnError(); } @@ -71,8 +73,8 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings( bool open_in_external_preview = job_settings.HasKey(kSettingOpenPDFInPreview); - if (!open_in_external_preview && - (print_to_pdf || print_to_cloud || is_cloud_dialog)) { + if (!open_in_external_preview && (print_to_pdf || print_to_cloud || + is_cloud_dialog || print_with_privet)) { settings_.set_dpi(kDefaultPdfDpi); // Cloud print should get size and rect from capabilities received from // server. |