Consolidate AppControllDelegate to ExtensionsDelegate

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 111 matching lines @@
       '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/content_activity_factory.h',
         'content/public/content_activity_factory_creator.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',
@@ skipping 30 matching lines @@
         '../ui/base/ui_base.gyp:ui_base_test_support',
         '../ui/compositor/compositor.gyp:compositor_test_support',
         '../ui/views/views.gyp:views',
         '../ui/wm/wm.gyp:wm',
         '../url/url.gyp:url_lib',
         'athena_content_lib',
         'athena_lib',
         'resources/athena_resources.gyp:athena_resources',
       ],
       'sources': [
-        'content/public/app_content_control_delegate.h',
         'extensions/test/test_extensions_delegate.cc',
         'test/athena_test_base.cc',
         'test/athena_test_base.h',
         'test/athena_test_helper.cc',
         'test/athena_test_helper.h',
         'test/sample_activity.cc',
         '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',
         'wm/test/window_manager_impl_test_api.cc',
         'wm/test/window_manager_impl_test_api.h',
       ],
     },
     {
       'target_name': 'athena_unittests',
       'type': 'executable',
       'dependencies': [
@@ skipping 15 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',
       ],
     }
   ],
 }