summaryrefslogtreecommitdiffstats
path: root/content/content_plugin.gypi
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 21:11:29 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 21:11:29 +0000
commit54f8747d6057a3e794e1c24c3246c7d6c580db3f (patch)
treed72d287d49387521829c85355911eb449a9ef3b0 /content/content_plugin.gypi
parente44df4bd50372d562731300d039f8d22029d8548 (diff)
downloadchromium_src-54f8747d6057a3e794e1c24c3246c7d6c580db3f.zip
chromium_src-54f8747d6057a3e794e1c24c3246c7d6c580db3f.tar.gz
chromium_src-54f8747d6057a3e794e1c24c3246c7d6c580db3f.tar.bz2
fix indentation in content_*.gypi.
This is a whitespace-only change to clean up from the refactoring of a couple weeks ago for the component build. R=jam@chromium.org BUG=90442 TEST=none Review URL: http://codereview.chromium.org/8046015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_plugin.gypi')
-rw-r--r--content/content_plugin.gypi89
1 files changed, 44 insertions, 45 deletions
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index 4ef9ca2..e1dd81d 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -3,52 +3,51 @@
# found in the LICENSE file.
{
- # TODO(dpranke): Fix indentation.
- 'dependencies': [
- '../skia/skia.gyp:skia',
- '../third_party/npapi/npapi.gyp:npapi',
- '../webkit/support/webkit_support.gyp:glue',
- ],
+ 'dependencies': [
+ '../skia/skia.gyp:skia',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../webkit/support/webkit_support.gyp:glue',
+ ],
+ 'include_dirs': [
+ '<(INTERMEDIATE_DIR)',
+ ],
+ 'sources': [
+ # All .cc, .h, .m, and .mm files under plugins except for tests and
+ # mocks.
+ 'plugin/content_plugin_client.h',
+ 'plugin/plugin_channel.cc',
+ 'plugin/plugin_channel.h',
+ 'plugin/plugin_interpose_util_mac.mm',
+ 'plugin/plugin_interpose_util_mac.h',
+ 'plugin/plugin_main.cc',
+ 'plugin/plugin_main_linux.cc',
+ 'plugin/plugin_main_mac.mm',
+ 'plugin/plugin_thread.cc',
+ 'plugin/plugin_thread.h',
+ 'plugin/webplugin_accelerated_surface_proxy_mac.cc',
+ 'plugin/webplugin_accelerated_surface_proxy_mac.h',
+ 'plugin/webplugin_delegate_stub.cc',
+ 'plugin/webplugin_delegate_stub.h',
+ 'plugin/webplugin_proxy.cc',
+ 'plugin/webplugin_proxy.h',
+ ],
+ # These are layered in conditionals in the event other platforms
+ # end up using this module as well.
+ 'conditions': [
+ ['OS=="win"', {
'include_dirs': [
- '<(INTERMEDIATE_DIR)',
+ '<(DEPTH)/third_party/wtl/include',
],
- 'sources': [
- # All .cc, .h, .m, and .mm files under plugins except for tests and
- # mocks.
- 'plugin/content_plugin_client.h',
- 'plugin/plugin_channel.cc',
- 'plugin/plugin_channel.h',
- 'plugin/plugin_interpose_util_mac.mm',
- 'plugin/plugin_interpose_util_mac.h',
- 'plugin/plugin_main.cc',
- 'plugin/plugin_main_linux.cc',
- 'plugin/plugin_main_mac.mm',
- 'plugin/plugin_thread.cc',
- 'plugin/plugin_thread.h',
- 'plugin/webplugin_accelerated_surface_proxy_mac.cc',
- 'plugin/webplugin_accelerated_surface_proxy_mac.h',
- 'plugin/webplugin_delegate_stub.cc',
- 'plugin/webplugin_delegate_stub.h',
- 'plugin/webplugin_proxy.cc',
- 'plugin/webplugin_proxy.h',
- ],
- # These are layered in conditionals in the event other platforms
- # end up using this module as well.
- 'conditions': [
- ['OS=="win"', {
- 'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
- ],
- }],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- 'link_settings': {
- 'libraries': [
- '-lXext',
- ],
- },
- }],
+ }],
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
],
+ 'link_settings': {
+ 'libraries': [
+ '-lXext',
+ ],
+ },
+ }],
+ ],
}