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

Unified Diff: chrome/renderer/print_web_view_helper.cc

Issue 7461014: Fix issue in print preview where selecting a cloud printer does not generate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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
« no previous file with comments | « chrome/renderer/print_web_view_helper.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/print_web_view_helper.cc
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index 8d7814640bbe4282cd5a9d3406a26d6a9045b523..745d3d44f541d4d190c5da3ce906a8987606bdef 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -700,6 +700,17 @@ bool PrintWebViewHelper::InitPrintSettings(WebKit::WebFrame* frame,
return true;
}
+bool PrintWebViewHelper::UpdatePrintSettingsRequestId(
+ const DictionaryValue& job_settings,
+ PrintMsg_Print_Params* params) {
+ if (!job_settings.GetInteger(printing::kPreviewRequestID,
+ &(params->preview_request_id))) {
+ NOTREACHED();
+ return false;
dpapad 2011/07/20 00:54:11 I think a return statement after a NOTREACHED() is
+ }
+ return true;
+}
+
bool PrintWebViewHelper::UpdatePrintSettingsCloud(
const DictionaryValue& job_settings) {
// Document cookie and pages are set by the
@@ -718,6 +729,8 @@ bool PrintWebViewHelper::UpdatePrintSettingsCloud(
settings.params.desired_dpi = 72;
settings.params.selection_only = false;
settings.params.supports_alpha_blend = false;
+ if (!UpdatePrintSettingsRequestId(job_settings, &(settings.params)))
+ return false;
// TODO(abodenha@chromium.org) Parse page ranges from the job_settings.
print_pages_params_.reset(new PrintMsg_PrintPages_Params(settings));
return true;
@@ -733,11 +746,8 @@ bool PrintWebViewHelper::UpdatePrintSettingsLocal(
if (settings.params.dpi < kMinDpi || !settings.params.document_cookie)
return false;
- if (!job_settings.GetInteger(printing::kPreviewRequestID,
- &settings.params.preview_request_id)) {
- NOTREACHED();
+ if (!UpdatePrintSettingsRequestId(job_settings, &(settings.params)))
dpapad 2011/07/20 00:54:11 I believe that operator . has higher precedence th
return false;
- }
print_pages_params_.reset(new PrintMsg_PrintPages_Params(settings));
Send(new PrintHostMsg_DidGetDocumentCookie(routing_id(),
« no previous file with comments | « chrome/renderer/print_web_view_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698