diff options
| author | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
|---|---|---|
| committer | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
| commit | 2ec8df5602bedf518d0119005690b101d5b598ef (patch) | |
| tree | 04b9d44fdc22ceab2d10a02108765729062241c4 /webkit/glue | |
| parent | 88efcce0d60e09489d8a3761f4c8fd0d4b51c625 (diff) | |
| download | chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.zip chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.gz chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.bz2 | |
Made the OS_LINUX ifdefs in ui/ and webkit/ directories more cross-platform, so that these files can be used on multiple POSIX platforms.
Review URL: http://codereview.chromium.org/6990051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 31c6b13..7d44361 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -206,11 +206,7 @@ WebKitClientImpl::~WebKitClientImpl() { } WebThemeEngine* WebKitClientImpl::themeEngine() { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) return &theme_engine_; -#else - return NULL; -#endif } WebURLLoader* WebKitClientImpl::createURLLoader() { diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h index 52a216b..fbf3daf 100644 --- a/webkit/glue/webkitclient_impl.h +++ b/webkit/glue/webkitclient_impl.h @@ -10,10 +10,10 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h" #if defined(OS_WIN) #include "webkit/glue/webthemeengine_impl_win.h" -#elif defined(OS_LINUX) -#include "webkit/glue/webthemeengine_impl_linux.h" #elif defined(OS_MACOSX) #include "webkit/glue/webthemeengine_impl_mac.h" +#elif defined(OS_POSIX) +#include "webkit/glue/webthemeengine_impl_linux.h" #endif @@ -91,10 +91,7 @@ class WebKitClientImpl : public WebKit::WebKitClient { void (*shared_timer_func_)(); double shared_timer_fire_time_; int shared_timer_suspended_; // counter - -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) WebThemeEngineImpl theme_engine_; -#endif }; } // namespace webkit_glue |