diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 20:49:22 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 20:49:22 +0000 |
commit | 6d156893bcf18435440d1ab9668fa66d90cd5dee (patch) | |
tree | 93bdba24b976ce6d420803fc310a2d86e8dd120d /printing/print_settings.h | |
parent | d4a66c99465e0e42a75741220171057761ce073e (diff) | |
download | chromium_src-6d156893bcf18435440d1ab9668fa66d90cd5dee.zip chromium_src-6d156893bcf18435440d1ab9668fa66d90cd5dee.tar.gz chromium_src-6d156893bcf18435440d1ab9668fa66d90cd5dee.tar.bz2 |
Printing: Temporary fix on Linux using dummy print settings until we get the entire Linux printing pipeline to match Win/Mac.
BUG=none
TEST=printing works.
Review URL: http://codereview.chromium.org/3619002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/print_settings.h')
-rw-r--r-- | printing/print_settings.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/printing/print_settings.h b/printing/print_settings.h index 8cde1ca..a7fe73c 100644 --- a/printing/print_settings.h +++ b/printing/print_settings.h @@ -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. @@ -14,10 +14,13 @@ #import <ApplicationServices/ApplicationServices.h> #endif +#if defined(OS_WIN) typedef struct HDC__* HDC; typedef struct _devicemodeW DEVMODE; +#elif defined(USE_X11) typedef struct _GtkPrintSettings GtkPrintSettings; typedef struct _GtkPageSetup GtkPageSetup; +#endif namespace printing { @@ -30,7 +33,7 @@ class PrintSettings { // Reinitialize the settings to the default values. void Clear(); -#ifdef WIN32 +#if defined(OS_WIN) // Reads the settings from the selected device context. Calculates derived // values like printable_area_. void Init(HDC hdc, @@ -42,7 +45,7 @@ class PrintSettings { // Reads the settings from the given PMPrinter and PMPageFormat. void Init(PMPrinter printer, PMPageFormat page_format, const PageRanges& new_ranges, bool print_selection_only); -#elif defined(OS_LINUX) +#elif defined(USE_X11) // Initializes the settings from the given GtkPrintSettings and GtkPageSetup. // TODO(jhawkins): This method is a mess across the platforms. Refactor. void Init(GtkPrintSettings* settings, |