diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 19:34:42 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 19:34:42 +0000 |
| commit | 0ff0ff32b0b9f301200cb4e595fef541118a2987 (patch) | |
| tree | a5b2b36d46f61da2ec5f7f1342d493bacdd06a39 /chrome/browser/printing/print_job_worker.cc | |
| parent | 77b068f9a6b46531e3155f77e4832ce26cfe966f (diff) | |
| download | chromium_src-0ff0ff32b0b9f301200cb4e595fef541118a2987.zip chromium_src-0ff0ff32b0b9f301200cb4e595fef541118a2987.tar.gz chromium_src-0ff0ff32b0b9f301200cb4e595fef541118a2987.tar.bz2 | |
Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5856001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_job_worker.cc')
| -rw-r--r-- | chrome/browser/printing/print_job_worker.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 24062d1..26b5fb3 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -84,7 +84,7 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings, printing_context_->set_use_overlays(use_overlays); if (ask_user_for_settings) { -#if defined(OS_MACOSX) || defined(USE_X11) +#if defined(OS_POSIX) BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &PrintJobWorker::GetSettingsWithUI, @@ -96,14 +96,14 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings, document_page_count, has_selection, NewCallback(this, &PrintJobWorker::GetSettingsDone)); -#endif // defined(OS_MACOSX) || defined(USE_X11) +#endif // defined(OS_POSIX) } else { -#if defined(OS_MACOSX) || defined(USE_X11) +#if defined(OS_POSIX) BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &PrintJobWorker::UseDefaultSettings)); #else UseDefaultSettings(); -#endif // defined(OS_MACOSX) || defined(USE_X11) +#endif // defined(OS_POSIX) } } @@ -122,7 +122,7 @@ void PrintJobWorker::GetSettingsDone(PrintingContext::Result result) { result)); } -#if defined(OS_MACOSX) || defined(USE_X11) +#if defined(OS_POSIX) void PrintJobWorker::GetSettingsWithUI(gfx::NativeView parent_view, int document_page_count, bool has_selection) { @@ -139,7 +139,7 @@ void PrintJobWorker::GetSettingsWithUIDone(PrintingContext::Result result) { message_loop()->PostTask(FROM_HERE, NewRunnableMethod( this, &PrintJobWorker::GetSettingsDone, result)); } -#endif // defined(OS_MACOSX) || defined(USE_X11) +#endif // defined(OS_POSIX) void PrintJobWorker::UseDefaultSettings() { PrintingContext::Result result = printing_context_->UseDefaultSettings(); |