diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 15:52:26 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 15:52:26 +0000 |
| commit | a6f1bdf9695e627330caec5d727878ca18235a30 (patch) | |
| tree | 3bd6d200c623c1987115c37ad5d5a5c87ae2925e /webkit | |
| parent | b1f61b03866ff2cccb0d9d07645d6780b719b0b9 (diff) | |
| download | chromium_src-a6f1bdf9695e627330caec5d727878ca18235a30.zip chromium_src-a6f1bdf9695e627330caec5d727878ca18235a30.tar.gz chromium_src-a6f1bdf9695e627330caec5d727878ca18235a30.tar.bz2 | |
Make use_aura set use_default_render_theme and moves
webthemeengine_impl_linux to webthemeengine_impl_default.
BUG=none
TEST=none
R=tony@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11299074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 15 | ||||
| -rw-r--r-- | webkit/glue/webkitplatformsupport_impl.h | 7 | ||||
| -rw-r--r-- | webkit/glue/webthemeengine_impl_default.cc (renamed from webkit/glue/webthemeengine_impl_linux.cc) | 2 | ||||
| -rw-r--r-- | webkit/glue/webthemeengine_impl_default.h (renamed from webkit/glue/webthemeengine_impl_linux.h) | 8 |
4 files changed, 21 insertions, 11 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 4fb60f6..636fd03 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -352,8 +352,8 @@ 'websocketstreamhandle_impl.h', 'webthemeengine_impl_android.cc', 'webthemeengine_impl_android.h', - 'webthemeengine_impl_linux.cc', - 'webthemeengine_impl_linux.h', + 'webthemeengine_impl_default.cc', + 'webthemeengine_impl_default.h', 'webthemeengine_impl_mac.cc', 'webthemeengine_impl_mac.h', 'webthemeengine_impl_win.cc', @@ -384,6 +384,17 @@ # own hard dependencies. 'hard_dependency': 1, 'conditions': [ + ['use_default_render_theme==0', { + 'sources/': [ + ['exclude', 'webthemeengine_impl_default.cc'], + ['exclude', 'webthemeengine_impl_default.h'], + ], + }, { # else: use_default_render_theme==1 + 'sources/': [ + ['exclude', 'webthemeengine_impl_win.cc'], + ['exclude', 'webthemeengine_impl_win.h'], + ], + }], ['toolkit_uses_gtk == 1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:gtk', diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h index 263cdc7..1d719f5 100644 --- a/webkit/glue/webkitplatformsupport_impl.h +++ b/webkit/glue/webkitplatformsupport_impl.h @@ -14,17 +14,16 @@ #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/webkit_glue_export.h" -#if defined(OS_WIN) +#if defined(USE_DEFAULT_RENDER_THEME) +#include "webkit/glue/webthemeengine_impl_default.h" +#elif defined(OS_WIN) #include "webkit/glue/webthemeengine_impl_win.h" #elif defined(OS_MACOSX) #include "webkit/glue/webthemeengine_impl_mac.h" #elif defined(OS_ANDROID) #include "webkit/glue/webthemeengine_impl_android.h" -#elif defined(OS_POSIX) && !defined(OS_ANDROID) -#include "webkit/glue/webthemeengine_impl_linux.h" #endif - class MessageLoop; namespace webkit { diff --git a/webkit/glue/webthemeengine_impl_linux.cc b/webkit/glue/webthemeengine_impl_default.cc index 79e5430..b579cee 100644 --- a/webkit/glue/webthemeengine_impl_linux.cc +++ b/webkit/glue/webthemeengine_impl_default.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/webthemeengine_impl_linux.h" +#include "webkit/glue/webthemeengine_impl_default.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" diff --git a/webkit/glue/webthemeengine_impl_linux.h b/webkit/glue/webthemeengine_impl_default.h index 2156f36..24b75ae 100644 --- a/webkit/glue/webthemeengine_impl_linux.h +++ b/webkit/glue/webthemeengine_impl_default.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_LINUX_H_ -#define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_LINUX_H_ +#ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_DEFAULT_H_ +#define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_DEFAULT_H_ -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebThemeEngine.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/default/WebThemeEngine.h" namespace webkit_glue { @@ -23,4 +23,4 @@ class WebThemeEngineImpl : public WebKit::WebThemeEngine { } // namespace webkit_glue -#endif // WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_LINUX_H_ +#endif // WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_DEFAULT_H_ |