Athena: Adding basic resource management framework (un-/re-loading) of V2 applications

athena/athena.gyp

Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index da4bd4d7555280ed30fac33dfd61c2c446b32dba..dc4f25c511b2e4d02c780933874190d0eae23f92 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -114,23 +114,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': [
@@ -151,6 +168,7 @@
         'resources/athena_resources.gyp:athena_resources',
       ],
       'sources': [
+        'content/public/app_content_control_delegate.h',
         'main/athena_launcher.cc',
         'main/athena_launcher.h',
         'main/placeholder.cc',
@@ -163,6 +181,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',
       ],
@@ -175,14 +194,16 @@
         '../skia/skia.gyp:skia',
         'athena_lib',
         'athena_test_support',
+        'athena_content_lib', 
         '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',