summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 05:55:18 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 05:55:18 +0000
commite0cabc4b23b4c0d61f0dc23fa6c11eefa268b324 (patch)
treebb93226537fb6144acec4b439e818d660c471ee2 /extensions
parenta64ce0ff68fffe6b510c5132251838b5648c50ff (diff)
downloadchromium_src-e0cabc4b23b4c0d61f0dc23fa6c11eefa268b324.zip
chromium_src-e0cabc4b23b4c0d61f0dc23fa6c11eefa268b324.tar.gz
chromium_src-e0cabc4b23b4c0d61f0dc23fa6c11eefa268b324.tar.bz2
Consolidate extensions module temporary deps in extensions/DEPS
This makes it easier to see in one place how many more dependencies we need to break between //extensions and //chrome. BUG=none TEST=checkdeps passes TBR=sky@chromium.org for DEPS shuffle between files (no new DEPS actually added) NOTRY=true Review URL: https://codereview.chromium.org/221433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/DEPS41
-rw-r--r--extensions/browser/DEPS25
-rw-r--r--extensions/common/DEPS28
3 files changed, 35 insertions, 59 deletions
diff --git a/extensions/DEPS b/extensions/DEPS
index 038ba10..d8bae4a 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -1,17 +1,46 @@
-# NOTE: Please only include major-module dependencies here.
-# Individual file include rules should live in extensions/browser/DEPS or
-# extensions/common/DEPS.
include_rules = [
"+components/url_matcher",
"+content/public/common",
"+crypto",
"+testing",
- "+ui"
+ "+ui",
+
+ # Temporarily allowed includes as part of the app shell/extensions refactor.
+ #
+ # NOTE: Please do not add includes without talking to the app shell team;
+ # see OWNERS for this directory.
+ #
+ # TODO(jamescook): Remove these. http://crbug.com/162530
+ "!chrome/browser/chrome_notification_types.h",
+ "!chrome/browser/extensions/api/content_settings/content_settings_store.h",
+ "!chrome/browser/extensions/api/runtime/runtime_api.h",
+ "!chrome/browser/renderer_host/chrome_render_message_filter.h",
+ "!chrome/common/extensions/features/feature_channel.h",
+ "!chrome/common/extensions/api/generated_schemas.h",
+ "!grit/chromium_strings.h",
+ "!grit/common_resources.h",
+ "!grit/extensions_api_resources.h",
+ "!grit/generated_resources.h",
+ "!grit/theme_resources.h",
]
-# Allow test support.
specific_include_rules = {
- ".*test\.(h|cc)$": [
+ ".*(test|test_util)\.(cc|h)$": [
"+content/public/test",
+
+ # Temporarily allowed testing includes. See above.
+ # TODO(jamescook): Remove these. http://crbug.com/162530
+ "+chrome/browser/extensions/extension_api_unittest.h",
+ "+chrome/browser/extensions/extension_service_unittest.h",
+ "+chrome/browser/extensions/test_extension_system.h",
+ "+chrome/common/chrome_paths.h",
+ "+chrome/common/extensions/manifest_tests/extension_manifest_test.h",
+ "+chrome/test/base/testing_profile.h",
+ ],
+ "permissions_data_unittest\.cc": [
+ "+chrome/common/chrome_version_info.h",
+ "+chrome/common/extensions/extension_test_util.h",
+ "+chrome/common/extensions/features/feature_channel.h",
+ "+chrome/common/extensions/permissions/socket_permission.h",
],
}
diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS
index a29b640..0cfffde 100644
--- a/extensions/browser/DEPS
+++ b/extensions/browser/DEPS
@@ -5,29 +5,4 @@ include_rules = [
"+net",
"+sync",
"+third_party/leveldatabase",
-
- # Temporarily allowed includes as part of the app shell/extensions refactor.
- #
- # NOTE: Please do not add includes without talking to the app shell team;
- # see OWNERS for this directory.
- #
- # TODO(jamescook): Remove these. http://crbug.com/162530
- "+chrome/browser/chrome_notification_types.h",
- "+chrome/browser/extensions/api/content_settings/content_settings_store.h",
- "+chrome/browser/extensions/api/runtime/runtime_api.h",
- "+chrome/browser/renderer_host/chrome_render_message_filter.h",
- "+chrome/common/extensions/features/feature_channel.h",
- "+grit/generated_resources.h",
]
-
-specific_include_rules = {
- "(.*test|.*test_util)\.(cc|h)": [
- # Temporarily allowed testing includes. See above.
- # TODO(jamescook): Remove these. http://crbug.com/162530
- "+chrome/browser/extensions/extension_api_unittest.h",
- "+chrome/browser/extensions/extension_service_unittest.h",
- "+chrome/browser/extensions/test_extension_system.h",
- "+chrome/common/chrome_paths.h",
- "+chrome/test/base/testing_profile.h",
- ],
-}
diff --git a/extensions/common/DEPS b/extensions/common/DEPS
index 12baab5..19732c6 100644
--- a/extensions/common/DEPS
+++ b/extensions/common/DEPS
@@ -2,32 +2,4 @@ include_rules = [
"+device/usb",
"+net",
"+third_party/re2",
-
- # Temporarily allowed includes as part of the app shell/extensions refactor.
- #
- # NOTE: Please do not add includes without talking to the app shell team;
- # see OWNERS for this directory.
- #
- # TODO(benwells): Remove these. http://crbug.com/162530
- "+chrome/common/extensions/api/generated_schemas.h",
- "+grit/chromium_strings.h",
- "+grit/common_resources.h",
- "+grit/extensions_api_resources.h",
- "+grit/theme_resources.h",
- # TODO(jamescook): Extract extensions-related strings from this file.
- "+grit/generated_resources.h",
]
-
-specific_include_rules = {
- ".*test\.cc": [
- # Temporarily allowed testing includes. See above.
- # TODO(benwells): Remove these. http://crbug.com/162530
- "+chrome/common/extensions/manifest_tests/extension_manifest_test.h",
- ],
- "^permissions_data_unittest\.cc$": [
- "+chrome/common/chrome_version_info.h",
- "+chrome/common/extensions/extension_test_util.h",
- "+chrome/common/extensions/features/feature_channel.h",
- "+chrome/common/extensions/permissions/socket_permission.h",
- ],
-}