diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 19:34:42 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 19:34:42 +0000 |
| commit | 0ff0ff32b0b9f301200cb4e595fef541118a2987 (patch) | |
| tree | a5b2b36d46f61da2ec5f7f1342d493bacdd06a39 /gfx | |
| parent | 77b068f9a6b46531e3155f77e4832ce26cfe966f (diff) | |
| download | chromium_src-0ff0ff32b0b9f301200cb4e595fef541118a2987.zip chromium_src-0ff0ff32b0b9f301200cb4e595fef541118a2987.tar.gz chromium_src-0ff0ff32b0b9f301200cb4e595fef541118a2987.tar.bz2 | |
Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5856001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/native_widget_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/native_widget_types.h b/gfx/native_widget_types.h index 9c85edd..89b091b 100644 --- a/gfx/native_widget_types.h +++ b/gfx/native_widget_types.h @@ -37,7 +37,7 @@ // 'views'. #if defined(OS_WIN) -#include <windows.h> +#include <windows.h> // NOLINT typedef struct HFONT__* HFONT; #elif defined(OS_MACOSX) struct CGContext; @@ -120,7 +120,7 @@ static inline NativeView NativeViewFromId(NativeViewId id) { return reinterpret_cast<NativeView>(id); } #define NativeViewFromIdInBrowser(x) NativeViewFromId(x) -#elif defined(OS_MACOSX) || defined(USE_X11) +#elif defined(OS_POSIX) // 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. @@ -133,7 +133,7 @@ static inline NativeView NativeViewFromId(NativeViewId id) { static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) { return reinterpret_cast<NativeView>(id); } -#endif // defined(OS_MACOSX) || defined(USE_X11) +#endif // defined(OS_POSIX) // Convert a NativeView to a NativeViewId. See the comments at the top of // this file. |