diff options
| author | jamescook <jamescook@chromium.org> | 2014-10-20 07:35:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-20 14:35:30 +0000 |
| commit | 62117928b7e16e4b1080e802f26ca43f8ce1e997 (patch) | |
| tree | fbedb04f41badd87a7fac3e14715e58a5c6bccdf /extensions/extensions.gyp | |
| parent | 34cb061236f5c334606379297c2dfdfded0a490e (diff) | |
| download | chromium_src-62117928b7e16e4b1080e802f26ca43f8ce1e997.zip chromium_src-62117928b7e16e4b1080e802f26ca43f8ce1e997.tar.gz chromium_src-62117928b7e16e4b1080e802f26ca43f8ce1e997.tar.bz2 | |
Add support for app_shell-only extension APIs
Also add a stub for an identity-related API as an example.
BUG=424651
TEST=app_shell_unittests
Review URL: https://codereview.chromium.org/660333003
Cr-Commit-Position: refs/heads/master@{#300265}
Diffstat (limited to 'extensions/extensions.gyp')
| -rw-r--r-- | extensions/extensions.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 2b866df..75ed4cb 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -966,6 +966,9 @@ 'dependencies': [ '../base/base.gyp:base', '../components/components.gyp:user_prefs', + '../content/content.gyp:content_browser', + '../content/content.gyp:content_common', + '../content/content_shell_and_tests.gyp:test_support_content', '../net/net.gyp:net_test_support', '../testing/gtest.gyp:gtest', 'browser/api/api_registration.gyp:extensions_api_registration', @@ -986,6 +989,8 @@ 'browser/api/storage/settings_test_util.h', 'browser/api_test_utils.cc', 'browser/api_test_utils.h', + 'browser/api_unittest.cc', + 'browser/api_unittest.h', 'browser/extension_error_test_util.cc', 'browser/extension_error_test_util.h', 'browser/extensions_test.cc', @@ -1039,6 +1044,7 @@ '../ui/strings/ui_strings.gyp:ui_strings', 'extensions_resources.gyp:extensions_resources', 'extensions_strings.gyp:extensions_strings', + 'shell/app_shell_resources.gyp:app_shell_resources', ], 'actions': [ { @@ -1051,7 +1057,7 @@ '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_browser_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/extensions/shell/app_shell_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak', @@ -1122,8 +1128,6 @@ 'browser/content_hash_tree_unittest.cc', 'browser/event_listener_map_unittest.cc', 'browser/event_router_unittest.cc', - 'browser/api_unittest.cc', - 'browser/api_unittest.h', 'browser/error_map_unittest.cc', 'browser/extension_icon_image_unittest.cc', 'browser/extension_pref_value_map_unittest.cc', |