[Athena: Cleanup] consolidate ChromeAppActivity and ShellAppActivity

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 168 matching lines @@
     },
     {
       'target_name': 'athena_chrome_lib',
       'type': 'static_library',
       'dependencies': [
         '../components/components.gyp:component_metrics_proto',
         '../chrome/chrome.gyp:browser_extensions',
         '../components/components.gyp:omnibox',
       ],
       'sources': [
-        'content/chrome/content_activity_factory.cc',
         'content/chrome/dialogs.cc',
         'content/chrome/scheme_classifier_factory.cc',
         'extensions/chrome/athena_chrome_app_delegate.cc',
         'extensions/chrome/athena_chrome_app_delegate.h',
         'extensions/chrome/athena_chrome_app_window_client.cc',
         'extensions/chrome/athena_chrome_app_window_client.h',
         'extensions/chrome/extensions_delegate_impl.cc',
       ],
     },
     {
       'target_name': 'athena_app_shell_lib',
       'type': 'static_library',
       'dependencies': [
         '../components/components.gyp:component_metrics_proto',
         '../components/components.gyp:omnibox',
         '../extensions/shell/app_shell.gyp:app_shell_lib',
         '../skia/skia.gyp:skia',
       ],
       'sources': [
-        'content/shell/content_activity_factory.cc',
         'content/shell/dialogs.cc',
         'content/shell/scheme_classifier_factory.cc',
-        'content/shell/shell_app_activity.cc',
-        'content/shell/shell_app_activity.h',
         'extensions/shell/extensions_delegate_impl.cc',
         'extensions/shell/athena_shell_app_delegate.cc',
         'extensions/shell/athena_shell_app_delegate.h',
         'extensions/shell/athena_shell_app_window_client.cc',
         'extensions/shell/athena_shell_app_window_client.h',
         'extensions/shell/athena_apps_client_delegate.h',
       ],
     },
     {
       'target_name': 'athena_test_support',
@@ skipping 59 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',
       ],
     }
   ],
 }