Delete activity upon window deletion

athena/athena.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 14 matching lines @@
         'resources/athena_resources.gyp:athena_resources',
       ],
       'defines': [
         'ATHENA_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under athena, except unittests
         'activity/activity.cc',
         'activity/activity_factory.cc',
         'activity/activity_manager_impl.cc',
+        'activity/activity_manager_impl.h',
         'activity/activity_view_manager_impl.cc',
         'activity/activity_frame_view.cc',
         'activity/activity_frame_view.h',
         'activity/activity_widget_delegate.cc',
         'activity/activity_widget_delegate.h',
         'activity/public/activity.h',
         'activity/public/activity_factory.h',
         'activity/public/activity_manager.h',
         'activity/public/activity_view_manager.h',
         'activity/public/activity_view_model.h',
@@ skipping 62 matching lines @@
         '../extensions/extensions.gyp:extensions_common',
         '../extensions/shell/app_shell.gyp:app_shell_lib',
         '../content/content.gyp:content_browser',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/keyboard/keyboard.gyp:keyboard_resources',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../skia/skia.gyp:skia',
       ],
-      'defines': [
-        '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/delegate/app_content_control_delegate_impl.cc',        
+        'content/public/app_content_control_delegate.h',
         '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/render_view_context_menu_impl.cc',
         'content/render_view_context_menu_impl.h',
         'content/web_activity.cc',
         'content/web_activity.h',
         'content/web_contents_view_delegate_factory_impl.cc',
         'extensions/public/extensions_delegate.h',
-        'extensions/extensions_delegate_impl.cc',
+        'extensions/extensions_delegate.cc',
         'virtual_keyboard/public/virtual_keyboard_manager.h',
         'virtual_keyboard/virtual_keyboard_manager_impl.cc',
       ],
     },
     {
-      'target_name': 'athena_content_support_lib',
+      'target_name': 'athena_app_shell_lib',
       'type': 'static_library',
       'dependencies': [
-        '../content/content.gyp:content_browser',
+        '../extensions/shell/app_shell.gyp:app_shell_lib',
       ],
       'sources': [
-        'content/delegate/app_content_control_delegate_impl.cc',        
-        'content/public/app_content_control_delegate.h',
+        'extensions/shell/extensions_delegate_impl.cc',
       ],
     },
     {
       'target_name': 'athena_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../chromeos/chromeos.gyp:chromeos',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
@@ skipping 49 matching lines @@
         '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',
       ],
     }
   ],
 }