diff options
| -rw-r--r-- | chrome/browser/printing/print_job_worker.cc | 2 | ||||
| -rw-r--r-- | printing/printing_context.h | 2 | ||||
| -rw-r--r-- | printing/printing_context_cairo.cc | 2 | ||||
| -rw-r--r-- | printing/printing_context_cairo.h | 2 | ||||
| -rw-r--r-- | printing/printing_context_mac.h | 2 | ||||
| -rw-r--r-- | printing/printing_context_mac.mm | 4 | ||||
| -rw-r--r-- | printing/printing_context_win.cc | 2 | ||||
| -rw-r--r-- | printing/printing_context_win.h | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 8eb6eaf..fb38d47 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -128,7 +128,7 @@ void PrintJobWorker::UpdatePrintSettings( } } PrintingContext::Result result = - printing_context_->UpdatePrintSettings(new_settings, new_ranges); + printing_context_->UpdatePrintSettings(*new_settings, new_ranges); delete new_settings; GetSettingsDone(result); } diff --git a/printing/printing_context.h b/printing/printing_context.h index dca306b..c4e2094 100644 --- a/printing/printing_context.h +++ b/printing/printing_context.h @@ -51,7 +51,7 @@ class PrintingContext { // Updates print settings. |job_settings| contains all print job settings // information. |ranges| has the new page range settings. - virtual Result UpdatePrintSettings(const DictionaryValue* const job_settings, + virtual Result UpdatePrintSettings(const DictionaryValue& job_settings, const PageRanges& ranges) = 0; // Initializes with predefined settings. diff --git a/printing/printing_context_cairo.cc b/printing/printing_context_cairo.cc index cb7a092..75dac3e 100644 --- a/printing/printing_context_cairo.cc +++ b/printing/printing_context_cairo.cc @@ -149,7 +149,7 @@ PrintingContext::Result PrintingContextCairo::UseDefaultSettings() { } PrintingContext::Result PrintingContextCairo::UpdatePrintSettings( - const DictionaryValue* const job_settings, const PageRanges& ranges) { + const DictionaryValue& job_settings, const PageRanges& ranges) { DCHECK(!in_print_job_); settings_.ranges = ranges; diff --git a/printing/printing_context_cairo.h b/printing/printing_context_cairo.h index 192782f..caee1e3 100644 --- a/printing/printing_context_cairo.h +++ b/printing/printing_context_cairo.h @@ -40,7 +40,7 @@ class PrintingContextCairo : public PrintingContext { bool has_selection, PrintSettingsCallback* callback); virtual Result UseDefaultSettings(); - virtual Result UpdatePrintSettings(const DictionaryValue* const job_settings, + virtual Result UpdatePrintSettings(const DictionaryValue& job_settings, const PageRanges& ranges); virtual Result InitWithSettings(const PrintSettings& settings); virtual Result NewDocument(const string16& document_name); diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h index e87dfce..78b85c0 100644 --- a/printing/printing_context_mac.h +++ b/printing/printing_context_mac.h @@ -29,7 +29,7 @@ class PrintingContextMac : public PrintingContext { bool has_selection, PrintSettingsCallback* callback); virtual Result UseDefaultSettings(); - virtual Result UpdatePrintSettings(const DictionaryValue* const job_settings, + virtual Result UpdatePrintSettings(const DictionaryValue& job_settings, const PageRanges& ranges); virtual Result InitWithSettings(const PrintSettings& settings); virtual Result NewDocument(const string16& document_name); diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm index 1e354e0..a5d9b33 100644 --- a/printing/printing_context_mac.mm +++ b/printing/printing_context_mac.mm @@ -82,7 +82,7 @@ PrintingContext::Result PrintingContextMac::UseDefaultSettings() { } PrintingContext::Result PrintingContextMac::UpdatePrintSettings( - const DictionaryValue* const job_settings, const PageRanges& ranges) { + const DictionaryValue& job_settings, const PageRanges& ranges) { DCHECK(!in_print_job_); // TODO (kmadhusu): Update other print job settings such as number of copies, @@ -92,7 +92,7 @@ PrintingContext::Result PrintingContextMac::UpdatePrintSettings( print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]); std::string printer_name; - if (!job_settings->GetString("printerName", &printer_name)) + if (!job_settings.GetString("printerName", &printer_name)) return OnError(); NSString* new_printer_name = base::SysUTF8ToNSString(printer_name); diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 819c0077..23832ad 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -210,7 +210,7 @@ PrintingContext::Result PrintingContextWin::UseDefaultSettings() { } PrintingContext::Result PrintingContextWin::UpdatePrintSettings( - const DictionaryValue* const job_settings, const PageRanges& ranges) { + const DictionaryValue& job_settings, const PageRanges& ranges) { DCHECK(!in_print_job_); settings_.ranges = ranges; diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h index a1af2bb..d949966 100644 --- a/printing/printing_context_win.h +++ b/printing/printing_context_win.h @@ -28,7 +28,7 @@ class PrintingContextWin : public PrintingContext { bool has_selection, PrintSettingsCallback* callback); virtual Result UseDefaultSettings(); - virtual Result UpdatePrintSettings(const DictionaryValue* const job_settings, + virtual Result UpdatePrintSettings(const DictionaryValue& job_settings, const PageRanges& ranges); virtual Result InitWithSettings(const PrintSettings& settings); virtual Result NewDocument(const string16& document_name); |