diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 19:18:05 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 19:18:05 +0000 |
commit | b719142cac87c33ec2d6e99a238b5ecd48f87d68 (patch) | |
tree | cb073e88f553db6c3acab1c18c1f9e31793a80b7 /gfx | |
parent | b119a1e6bdd11040f93245e0b71d654a4883b40a (diff) | |
download | chromium_src-b719142cac87c33ec2d6e99a238b5ecd48f87d68.zip chromium_src-b719142cac87c33ec2d6e99a238b5ecd48f87d68.tar.gz chromium_src-b719142cac87c33ec2d6e99a238b5ecd48f87d68.tar.bz2 |
Printing: Implement PrintingContext::UseDefaultSettings for Linux/Cairo.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3389005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
-rw-r--r-- | gfx/native_widget_types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gfx/native_widget_types.h b/gfx/native_widget_types.h index 51b0885..729a9e9 100644 --- a/gfx/native_widget_types.h +++ b/gfx/native_widget_types.h @@ -104,20 +104,20 @@ static inline NativeView NativeViewFromId(NativeViewId id) { return reinterpret_cast<NativeView>(id); } #define NativeViewFromIdInBrowser(x) NativeViewFromId(x) -#elif defined(OS_MACOSX) -// On the Mac, a NativeView is a pointer to an object, and is useless outside -// the process in which it was created. NativeViewFromId should only be used -// inside the appropriate platform ifdef outside of the browser. +#elif defined(OS_MACOSX) || defined(USE_X11) +// On Mac and Linux, a NativeView is a pointer to an object, and is useless +// outside the process in which it was created. NativeViewFromId should only be +// used inside the appropriate platform ifdef outside of the browser. // (NativeViewFromIdInBrowser can be used everywhere in the browser.) If your // cross-platform design involves a call to NativeViewFromId from outside the -// browser it will never work on the Mac and is fundamentally broken. +// browser it will never work on Mac or Linux and is fundamentally broken. // Please do not call this from outside the browser. It won't work; the name // should give you a subtle hint. static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) { return reinterpret_cast<NativeView>(id); } -#endif +#endif // defined(OS_MACOSX) || defined(USE_X11) // Convert a NativeView to a NativeViewId. See the comments at the top of // this file. |