Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.

chrome/browser/printing/print_job_worker.cc

Index: chrome/browser/printing/print_job_worker.cc
===================================================================
--- chrome/browser/printing/print_job_worker.cc	(revision 69803)
+++ chrome/browser/printing/print_job_worker.cc	(working copy)
@@ -84,7 +84,7 @@
   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 @@
         document_page_count,
         has_selection,
         NewCallback(this, &PrintJobWorker::GetSettingsDone));

[Evan Martin, 2010/12/21 05:15:46]

I wish this stuff could be unified...

[Lei Zhang, 2010/12/21 05:39:23]

We can probably get rid of the Windows-only path, but in another CL...

-#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 @@
       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 @@
   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();