| Index: chrome/browser/printing/printing_message_filter.h
|
| diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h
|
| index 7a16d2eced781c76469b71aa9390ca6eb8058e11..69150876738e041ac84e95f486af2029aabdd90c 100644
|
| --- a/chrome/browser/printing/printing_message_filter.h
|
| +++ b/chrome/browser/printing/printing_message_filter.h
|
| @@ -33,6 +33,8 @@ class PrintJobManager;
|
| class PrintQueriesQueue;
|
| }
|
|
|
| +class PrintingUIWebContentsObserver;
|
| +
|
| // This class filters out incoming printing related IPC messages for the
|
| // renderer process on the IPC thread.
|
| class PrintingMessageFilter : public content::BrowserMessageFilter {
|
| @@ -116,12 +118,24 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
|
| // Modify the current print settings based on |job_settings|. The task is
|
| // handled by the print worker thread and the UI thread. The reply occurs on
|
| // the IO thread.
|
| - void OnUpdatePrintSettings(int document_cookie,
|
| + void OnUpdatePrintSettings(int render_view_id,
|
| + int document_cookie,
|
| const base::DictionaryValue& job_settings,
|
| IPC::Message* reply_msg);
|
| +
|
| + typedef base::Callback<void(scoped_refptr<printing::PrinterQuery>)>
|
| + OnUpdatePrintSettingsCallback;
|
| +
|
| + scoped_ptr<PrintingUIWebContentsObserver> OnUpdatePrintSettingsOnUIThread(
|
| + int render_view_id);
|
| + void OnUpdatePrintSettingsOnIOThread(
|
| + int document_cookie,
|
| + const OnUpdatePrintSettingsCallback& callback,
|
| + scoped_ptr<base::DictionaryValue> new_settings,
|
| + scoped_ptr<PrintingUIWebContentsObserver> wc_observer);
|
| void OnUpdatePrintSettingsReply(
|
| - scoped_refptr<printing::PrinterQuery> printer_query,
|
| - IPC::Message* reply_msg);
|
| + IPC::Message* reply_msg,
|
| + scoped_refptr<printing::PrinterQuery> printer_query);
|
|
|
| #if defined(ENABLE_FULL_PRINTING)
|
| // Check to see if print preview has been cancelled.
|
|
|