| Index: chrome/browser/printing/printing_message_filter.cc
|
| diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
|
| index 2ba8a02597072096c868796fd46e6a66abd0da99..c5250805c731b1e75ce67c2ff2b1ebd70bf73c80 100644
|
| --- a/chrome/browser/printing/printing_message_filter.cc
|
| +++ b/chrome/browser/printing/printing_message_filter.cc
|
| @@ -11,8 +11,11 @@
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/printing/printer_query.h"
|
| #include "chrome/browser/printing/print_job_manager.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/profiles/profile_io_data.h"
|
| #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
|
| #include "chrome/common/print_messages.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_contents_view.h"
|
| @@ -79,8 +82,11 @@ void RenderParamsFromPrintSettings(const printing::PrintSettings& settings,
|
|
|
| } // namespace
|
|
|
| -PrintingMessageFilter::PrintingMessageFilter(int render_process_id)
|
| +PrintingMessageFilter::PrintingMessageFilter(int render_process_id,
|
| + Profile* profile)
|
| : print_job_manager_(g_browser_process->print_job_manager()),
|
| + profile_io_data_(ProfileIOData::FromResourceContext(
|
| + profile->GetResourceContext())),
|
| render_process_id_(render_process_id) {
|
| }
|
|
|
| @@ -226,7 +232,7 @@ void PrintingMessageFilter::GetPrintSettingsForRenderView(
|
| void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| scoped_refptr<printing::PrinterQuery> printer_query;
|
| - if (!print_job_manager_->printing_enabled()) {
|
| + if (!profile_io_data_->printing_enabled()->GetValue()) {
|
| // Reply with NULL query.
|
| OnGetDefaultPrintSettingsReply(printer_query, reply_msg);
|
| return;
|
| @@ -327,7 +333,7 @@ void PrintingMessageFilter::OnUpdatePrintSettings(
|
| int document_cookie, const DictionaryValue& job_settings,
|
| IPC::Message* reply_msg) {
|
| scoped_refptr<printing::PrinterQuery> printer_query;
|
| - if (!print_job_manager_->printing_enabled()) {
|
| + if (!profile_io_data_->printing_enabled()->GetValue()) {
|
| // Reply with NULL query.
|
| OnUpdatePrintSettingsReply(printer_query, reply_msg);
|
| return;
|
|
|