| Index: chrome/browser/printing/print_job_worker.cc
|
| ===================================================================
|
| --- chrome/browser/printing/print_job_worker.cc (revision 69998)
|
| +++ chrome/browser/printing/print_job_worker.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2010 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.
|
|
|
| @@ -84,26 +84,14 @@
|
| printing_context_->set_use_overlays(use_overlays);
|
|
|
| if (ask_user_for_settings) {
|
| -#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));
|
| -#endif // defined(OS_POSIX)
|
| } else {
|
| -#if defined(OS_POSIX)
|
| BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| NewRunnableMethod(this, &PrintJobWorker::UseDefaultSettings));
|
| -#else
|
| - UseDefaultSettings();
|
| -#endif // defined(OS_POSIX)
|
| }
|
| }
|
|
|
| @@ -122,7 +110,6 @@
|
| result));
|
| }
|
|
|
| -#if defined(OS_POSIX)
|
| void PrintJobWorker::GetSettingsWithUI(gfx::NativeView parent_view,
|
| int document_page_count,
|
| bool has_selection) {
|
| @@ -139,7 +126,6 @@
|
| message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
|
| this, &PrintJobWorker::GetSettingsDone, result));
|
| }
|
| -#endif // defined(OS_POSIX)
|
|
|
| void PrintJobWorker::UseDefaultSettings() {
|
| PrintingContext::Result result = printing_context_->UseDefaultSettings();
|
|
|