summaryrefslogtreecommitdiffstats
path: root/athena/athena.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'athena/athena.gyp')
-rw-r--r--athena/athena.gyp32
1 files changed, 26 insertions, 6 deletions
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 448ba4e..6335641 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -115,23 +115,40 @@
'ATHENA_IMPLEMENTATION',
],
'sources': [
+ 'content/app_activity.cc',
+ 'content/app_activity.h',
+ 'content/app_activity_proxy.cc',
+ 'content/app_activity_proxy.h',
+ 'content/app_activity_registry.cc',
+ 'content/app_activity_registry.h',
+ 'content/app_registry_impl.cc',
+ 'content/content_activity_factory.cc',
+ 'content/content_app_model_builder.cc',
+ 'content/public/app_registry.h',
'content/public/content_activity_factory.h',
'content/public/content_app_model_builder.h',
'content/public/web_contents_view_delegate_creator.h',
- 'content/content_activity_factory.cc',
- 'content/content_app_model_builder.cc',
- 'content/app_activity.h',
- 'content/app_activity.cc',
'content/render_view_context_menu_impl.cc',
'content/render_view_context_menu_impl.h',
- 'content/web_activity.h',
'content/web_activity.cc',
+ 'content/web_activity.h',
'content/web_contents_view_delegate_factory_impl.cc',
'virtual_keyboard/public/virtual_keyboard_manager.h',
'virtual_keyboard/virtual_keyboard_manager_impl.cc',
],
},
{
+ 'target_name': 'athena_content_support_lib',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../content/content.gyp:content_browser',
+ ],
+ 'sources': [
+ 'content/delegate/app_content_control_delegate_impl.cc',
+ 'content/public/app_content_control_delegate.h',
+ ],
+ },
+ {
'target_name': 'athena_test_support',
'type': 'static_library',
'dependencies': [
@@ -152,6 +169,7 @@
'resources/athena_resources.gyp:athena_resources',
],
'sources': [
+ 'content/public/app_content_control_delegate.h',
'test/athena_test_base.cc',
'test/athena_test_base.h',
'test/athena_test_helper.cc',
@@ -160,6 +178,7 @@
'test/sample_activity.h',
'test/sample_activity_factory.cc',
'test/sample_activity_factory.h',
+ 'test/test_app_content_control_delegate_impl.cc',
'test/test_app_model_builder.cc',
'test/test_app_model_builder.h',
'test/test_screen_manager_delegate.cc',
@@ -178,11 +197,12 @@
'resources/athena_resources.gyp:athena_pak',
],
'sources': [
- 'test/athena_unittests.cc',
'activity/activity_manager_unittest.cc',
+ 'content/app_activity_unittest.cc',
'home/home_card_unittest.cc',
'input/accelerator_manager_unittest.cc',
'screen/screen_manager_unittest.cc',
+ 'test/athena_unittests.cc',
'wm/split_view_controller_unittest.cc',
'wm/window_list_provider_impl_unittest.cc',
'wm/window_manager_unittest.cc',