Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.

chrome/browser/printing/print_job_worker.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_job_worker.h"
 
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/printing/print_job.h"
@@ skipping 66 matching lines @@
                                  bool use_overlays) {
   DCHECK_EQ(message_loop(), MessageLoop::current());
   DCHECK_EQ(page_number_, PageNumber::npos());
 
   // Recursive task processing is needed for the dialog in case it needs to be
   // destroyed by a task.
   MessageLoop::current()->SetNestableTasksAllowed(true);
   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,
                           parent_view, document_page_count,
                           has_selection));
 #else
     printing_context_->AskUserForSettings(
         parent_view,
         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)
   }
 }
 
 void PrintJobWorker::GetSettingsDone(PrintingContext::Result result) {
   // Most PrintingContext functions may start a message loop and process
   // message recursively, so disable recursive task processing.
   MessageLoop::current()->SetNestableTasksAllowed(false);
 
   // We can't use OnFailure() here since owner_ may not support notifications.
 
   // PrintJob will create the new PrintedDocument.
   owner_->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
       owner_,
       &PrintJobWorkerOwner::GetSettingsDone,
       printing_context_->settings(),
       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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   printing_context_->AskUserForSettings(
       parent_view,
       document_page_count,
       has_selection,
       NewCallback(this, &PrintJobWorker::GetSettingsWithUIDone));
 }
 
 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();
   GetSettingsDone(result);
 }
 
 void PrintJobWorker::StartPrinting(PrintedDocument* new_document) {
   DCHECK_EQ(message_loop(), MessageLoop::current());
   DCHECK_EQ(page_number_, PageNumber::npos());
   DCHECK_EQ(document_, new_document);
@@ skipping 171 matching lines @@
     printing::PrintJobWorker* obj) {
   DCHECK(!owner_.get());
   owner_ = obj->owner_;
 }
 
 void RunnableMethodTraits<printing::PrintJobWorker>::ReleaseCallee(
     printing::PrintJobWorker* obj) {
   DCHECK_EQ(owner_, obj->owner_);
   owner_ = NULL;
 }