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 d7614ff12983894abaaede71512a0c094d057fe1..8199bca28879e31f9c4831516b95b16b20d08db3 100644 |
--- a/chrome/browser/printing/printing_message_filter.h |
+++ b/chrome/browser/printing/printing_message_filter.h |
@@ -32,7 +32,6 @@ namespace printing { |
class PrintJobManager; |
class PrintQueriesQueue; |
class PrinterQuery; |
-class PrintingUIWebContentsObserver; |
// This class filters out incoming printing related IPC messages for the |
// renderer process on the IPC thread. |
@@ -84,28 +83,19 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { |
// to base::Bind. |
struct GetPrintSettingsForRenderViewParams; |
- // Retrieve print settings. Uses |render_view_id| to get a parent |
- // for any UI created if needed. |
- void GetPrintSettingsForRenderView(int render_view_id, |
- GetPrintSettingsForRenderViewParams params, |
- const base::Closure& callback, |
- scoped_refptr<PrinterQuery> printer_query); |
- |
- void OnGetPrintSettingsFailed(const base::Closure& callback, |
- scoped_refptr<PrinterQuery> printer_query); |
- |
// Checks if printing is enabled. |
void OnIsPrintingEnabled(bool* is_enabled); |
// Get the default print setting. |
- void OnGetDefaultPrintSettings(IPC::Message* reply_msg); |
+ void OnGetDefaultPrintSettings(int render_view_id, IPC::Message* reply_msg); |
void OnGetDefaultPrintSettingsReply(scoped_refptr<PrinterQuery> printer_query, |
IPC::Message* reply_msg); |
// The renderer host have to show to the user the print dialog and returns |
// the selected print settings. The task is handled by the print worker |
// thread and the UI thread. The reply occurs on the IO thread. |
- void OnScriptedPrint(const PrintHostMsg_ScriptedPrint_Params& params, |
+ void OnScriptedPrint(int render_view_id, |
+ const PrintHostMsg_ScriptedPrint_Params& params, |
IPC::Message* reply_msg); |
void OnScriptedPrintReply(scoped_refptr<PrinterQuery> printer_query, |
IPC::Message* reply_msg); |
@@ -113,11 +103,12 @@ 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); |
- void OnUpdatePrintSettingsReply(scoped_refptr<PrinterQuery> printer_query, |
- IPC::Message* reply_msg); |
+ void OnUpdatePrintSettingsReply(IPC::Message* reply_msg, |
+ scoped_refptr<PrinterQuery> printer_query); |
#if defined(ENABLE_FULL_PRINTING) |
// Check to see if print preview has been cancelled. |