| Index: chrome/browser/printing/print_job_worker.cc
|
| diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
| index dd9c84b101ee8be6953bf708d073c0ea539e0b0e..276f5f69f698377e6b5d758d49c7caab47cb5625 100644
|
| --- a/chrome/browser/printing/print_job_worker.cc
|
| +++ b/chrome/browser/printing/print_job_worker.cc
|
| @@ -114,7 +114,8 @@ void PrintJobWorker::GetSettings(
|
| }
|
|
|
| void PrintJobWorker::SetSettings(
|
| - const base::DictionaryValue* const new_settings) {
|
| + scoped_ptr<PrintingUIWebContentsObserver> web_contents_observer,
|
| + scoped_ptr<base::DictionaryValue> new_settings) {
|
| DCHECK(task_runner_->RunsTasksOnCurrentThread());
|
|
|
| BrowserThread::PostTask(
|
| @@ -124,13 +125,17 @@ void PrintJobWorker::SetSettings(
|
| make_scoped_refptr(owner_),
|
| base::Bind(&PrintJobWorker::UpdatePrintSettings,
|
| base::Unretained(this),
|
| - base::Owned(new_settings))));
|
| + base::Passed(&web_contents_observer),
|
| + base::Passed(&new_settings))));
|
| }
|
|
|
| void PrintJobWorker::UpdatePrintSettings(
|
| - const base::DictionaryValue* const new_settings) {
|
| - PrintingContext::Result result =
|
| - printing_context_->UpdatePrintSettings(*new_settings);
|
| + scoped_ptr<PrintingUIWebContentsObserver> web_contents_observer,
|
| + scoped_ptr<base::DictionaryValue> new_settings) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| + PrintingContext::Result result = printing_context_->UpdatePrintSettings(
|
| + *new_settings,
|
| + web_contents_observer ? web_contents_observer->GetParentView() : NULL);
|
| GetSettingsDone(result);
|
| }
|
|
|
|
|