Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2380)

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Issue 2833993004: Print Preview: Make generate draft mode work again. (Closed)
Patch Set: Check NativeLayerStub Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index db11b376f6c94a243644be404739917a420fa4ea..0f0bde1698ffb13967aaf4c507c063f10e8e190e 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -737,7 +737,7 @@ void PrintPreviewHandler::HandleGetExtensionPrinterCapabilities(
}
void PrintPreviewHandler::HandleGetPreview(const base::ListValue* args) {
- DCHECK_EQ(3U, args->GetSize());
+ DCHECK_EQ(2U, args->GetSize());
std::unique_ptr<base::DictionaryValue> settings = GetSettingsDictionary(args);
if (!settings)
return;
@@ -794,18 +794,20 @@ void PrintPreviewHandler::HandleGetPreview(const base::ListValue* args) {
DCHECK(success);
if (!generate_draft_data) {
- double draft_page_count_double = -1;
- success = args->GetDouble(1, &draft_page_count_double);
+ int page_count = -1;
+ success = args->GetInteger(1, &page_count);
DCHECK(success);
- int draft_page_count = static_cast<int>(draft_page_count_double);
- bool preview_modifiable = false;
- success = args->GetBoolean(2, &preview_modifiable);
- DCHECK(success);
+ if (page_count != -1) {
+ bool preview_modifiable = false;
+ success = settings->GetBoolean(printing::kSettingPreviewModifiable,
+ &preview_modifiable);
+ DCHECK(success);
- if (draft_page_count != -1 && preview_modifiable &&
- print_preview_ui()->GetAvailableDraftPageCount() != draft_page_count) {
- settings->SetBoolean(printing::kSettingGenerateDraftData, true);
+ if (preview_modifiable &&
+ print_preview_ui()->GetAvailableDraftPageCount() != page_count) {
+ settings->SetBoolean(printing::kSettingGenerateDraftData, true);
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698