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

Unified Diff: chrome/browser/printing/print_job_worker.cc

Issue 3384035: Printing: Call PrintingContext::AskUserForSettings() on the UI thread for Linux (Closed)
Patch Set: Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/printing/print_job_worker.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ce1623bb8deeb0e08081df7207169c0ba252b833..cac0abfbdf719891790c81fb5840f8784ab5cc77 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -78,7 +78,7 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings,
printing_context_.SetUseOverlays(use_overlays);
if (ask_user_for_settings) {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(USE_X11)
ChromeThread::PostTask(
ChromeThread::UI, FROM_HERE,
NewRunnableMethod(this, &PrintJobWorker::GetSettingsWithUI,
@@ -90,7 +90,7 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings,
document_page_count,
has_selection,
NewCallback(this, &PrintJobWorker::GetSettingsDone));
-#endif
+#endif // defined(OS_MACOSX) || defined(USE_X11)
} else {
PrintingContext::Result result = printing_context_.UseDefaultSettings();
GetSettingsDone(result);
@@ -112,7 +112,7 @@ void PrintJobWorker::GetSettingsDone(PrintingContext::Result result) {
result));
}
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(USE_X11)
void PrintJobWorker::GetSettingsWithUI(gfx::NativeView parent_view,
int document_page_count,
bool has_selection) {
@@ -129,7 +129,7 @@ void PrintJobWorker::GetSettingsWithUIDone(PrintingContext::Result result) {
message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
this, &PrintJobWorker::GetSettingsDone, result));
}
-#endif
+#endif // defined(OS_MACOSX) || defined(USE_X11)
void PrintJobWorker::StartPrinting(PrintedDocument* new_document) {
DCHECK_EQ(message_loop(), MessageLoop::current());
« no previous file with comments | « chrome/browser/printing/print_job_worker.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698