diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 22:38:29 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 22:38:29 +0000 |
| commit | e63c4d7351d7ced6667d8d61a9971587c9779e5e (patch) | |
| tree | bfc7bce4be941eb85955089dfd7d95312c4fec0d /content/ppapi_plugin | |
| parent | b7b678f549e7a622615e6488d8e36fe998f85aec (diff) | |
| download | chromium_src-e63c4d7351d7ced6667d8d61a9971587c9779e5e.zip chromium_src-e63c4d7351d7ced6667d8d61a9971587c9779e5e.tar.gz chromium_src-e63c4d7351d7ced6667d8d61a9971587c9779e5e.tar.bz2 | |
Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or
USE_X11 where possible. An earlier version of this patch was used to build
Chromium on FreeBSD, OpenBSD, and Solaris.
Patch by ruben (chromium@hybridsource.org)
Review URL: http://codereview.chromium.org/7006006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_webkitclient_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/ppapi_plugin/ppapi_webkitclient_impl.cc b/content/ppapi_plugin/ppapi_webkitclient_impl.cc index 1abbe94..7908e0c 100644 --- a/content/ppapi_plugin/ppapi_webkitclient_impl.cc +++ b/content/ppapi_plugin/ppapi_webkitclient_impl.cc @@ -17,7 +17,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebSandboxSupport.h" #elif defined(OS_MACOSX) #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h" -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) #include "content/common/child_process_sandbox_support_linux.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h" #endif @@ -32,7 +32,7 @@ class PpapiWebKitClientImpl::SandboxSupport : public WebSandboxSupport { virtual bool ensureFontLoaded(HFONT); #elif defined(OS_MACOSX) virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out); -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) virtual WebString getFontFamilyForCharacters( const WebUChar* characters, size_t numCharacters, @@ -69,7 +69,7 @@ bool PpapiWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont, return false; } -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) WebString PpapiWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters( const WebUChar* characters, |