Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Side by Side Diff: chrome/browser/printing/print_job_worker.cc

Issue 8201027: Move margin processing code to the browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/printing/print_job_worker.h ('k') | chrome/browser/printing/printer_query.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/printing/print_job_worker.h" 5 #include "chrome/browser/printing/print_job_worker.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/printing/print_job.h" 10 #include "chrome/browser/printing/print_job.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 void PrintJobWorker::SetNewOwner(PrintJobWorkerOwner* new_owner) { 71 void PrintJobWorker::SetNewOwner(PrintJobWorkerOwner* new_owner) {
72 DCHECK(page_number_ == PageNumber::npos()); 72 DCHECK(page_number_ == PageNumber::npos());
73 owner_ = new_owner; 73 owner_ = new_owner;
74 } 74 }
75 75
76 void PrintJobWorker::GetSettings(bool ask_user_for_settings, 76 void PrintJobWorker::GetSettings(bool ask_user_for_settings,
77 gfx::NativeView parent_view, 77 gfx::NativeView parent_view,
78 int document_page_count, 78 int document_page_count,
79 bool has_selection, 79 bool has_selection,
80 bool use_overlays) { 80 MarginType margin_type) {
81 DCHECK_EQ(message_loop(), MessageLoop::current()); 81 DCHECK_EQ(message_loop(), MessageLoop::current());
82 DCHECK_EQ(page_number_, PageNumber::npos()); 82 DCHECK_EQ(page_number_, PageNumber::npos());
83 83
84 // Recursive task processing is needed for the dialog in case it needs to be 84 // Recursive task processing is needed for the dialog in case it needs to be
85 // destroyed by a task. 85 // destroyed by a task.
86 // TODO(thestig): this code is wrong, SetNestableTasksAllowed(true) is needed 86 // TODO(thestig): this code is wrong, SetNestableTasksAllowed(true) is needed
87 // on the thread where the PrintDlgEx is called, and definitely both calls 87 // on the thread where the PrintDlgEx is called, and definitely both calls
88 // should happen on the same thread. See http://crbug.com/73466 88 // should happen on the same thread. See http://crbug.com/73466
89 // MessageLoop::current()->SetNestableTasksAllowed(true); 89 // MessageLoop::current()->SetNestableTasksAllowed(true);
90 printing_context_->set_use_overlays(use_overlays); 90 printing_context_->set_margin_type(margin_type);
91 91
92 if (ask_user_for_settings) { 92 if (ask_user_for_settings) {
93 BrowserThread::PostTask( 93 BrowserThread::PostTask(
94 BrowserThread::UI, FROM_HERE, 94 BrowserThread::UI, FROM_HERE,
95 NewRunnableMethod(this, &PrintJobWorker::GetSettingsWithUI, 95 NewRunnableMethod(this, &PrintJobWorker::GetSettingsWithUI,
96 parent_view, document_page_count, 96 parent_view, document_page_count,
97 has_selection)); 97 has_selection));
98 } else { 98 } else {
99 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 99 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
100 NewRunnableMethod(this, &PrintJobWorker::UseDefaultSettings)); 100 NewRunnableMethod(this, &PrintJobWorker::UseDefaultSettings));
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 printing::PrintJobWorker* obj) { 357 printing::PrintJobWorker* obj) {
358 DCHECK(!owner_.get()); 358 DCHECK(!owner_.get());
359 owner_ = obj->owner_; 359 owner_ = obj->owner_;
360 } 360 }
361 361
362 void RunnableMethodTraits<printing::PrintJobWorker>::ReleaseCallee( 362 void RunnableMethodTraits<printing::PrintJobWorker>::ReleaseCallee(
363 printing::PrintJobWorker* obj) { 363 printing::PrintJobWorker* obj) {
364 DCHECK_EQ(owner_, obj->owner_); 364 DCHECK_EQ(owner_, obj->owner_);
365 owner_ = NULL; 365 owner_ = NULL;
366 } 366 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_job_worker.h ('k') | chrome/browser/printing/printer_query.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698