summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 16:50:58 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 16:50:58 +0000
commit2290cb86f535d7babd4d84a2a08831404885e78c (patch)
tree09bca698a3e1a66c14ff50771dee24cd5751c918 /chrome/chrome_common.gypi
parente9b3528e6a8d79f465fcdd2e44477f1eb9275539 (diff)
downloadchromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.zip
chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.gz
chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.bz2
Make webkit_glue not depend on default_plugin.
This removes a dependency cycle and should also make life easier for DRT. Revert http://codereview.chromium.org/1658012 Review URL: http://codereview.chromium.org/2358001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 064775a..0a06020 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -134,6 +134,7 @@
'../third_party/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
'../third_party/npapi/npapi.gyp:npapi',
+ '../webkit/default_plugin/default_plugin.gyp:default_plugin',
'../webkit/support/webkit_support.gyp:appcache',
'../webkit/support/webkit_support.gyp:glue',
],
@@ -191,9 +192,11 @@
'common/database_util.h',
'common/db_message_filter.cc',
'common/db_message_filter.h',
- 'common/dom_storage_common.h',
+ 'common/default_plugin.cc',
+ 'common/default_plugin.h',
'common/deprecated/event_sys-inl.h',
'common/deprecated/event_sys.h',
+ 'common/dom_storage_common.h',
'common/font_loader_mac.h',
'common/font_loader_mac.mm',
'common/gears_api.h',