| Index: athena/athena.gyp
|
| diff --git a/athena/athena.gyp b/athena/athena.gyp
|
| deleted file mode 100644
|
| index 2c4679d29ebb7a65b2feab543577a9d84e40be42..0000000000000000000000000000000000000000
|
| --- a/athena/athena.gyp
|
| +++ /dev/null
|
| @@ -1,365 +0,0 @@
|
| -# 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': [
|
| - {
|
| - 'target_name': 'athena_lib',
|
| - 'type': '<(component)',
|
| - 'dependencies': [
|
| - # status_icon_container_view.cc depends on this. Remove this once there
|
| - # are athena specific assets.
|
| - '../ash/ash_resources.gyp:ash_resources',
|
| - '../base/base.gyp:test_support_base',
|
| - '../chromeos/chromeos.gyp:power_manager_proto',
|
| - '../extensions/shell/app_shell.gyp:app_shell_version_header',
|
| - '../ipc/ipc.gyp:ipc',
|
| - '../skia/skia.gyp:skia',
|
| - '../ui/accessibility/accessibility.gyp:ax_gen',
|
| - '../ui/app_list/app_list.gyp:app_list',
|
| - '../ui/aura/aura.gyp:aura',
|
| - '../ui/aura/aura.gyp:aura_test_support',
|
| - '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
|
| - '../ui/display/display.gyp:display',
|
| - '../ui/events/devices/events_devices.gyp:events_devices',
|
| - '../ui/events/events.gyp:events_base',
|
| - '../ui/strings/ui_strings.gyp:ui_strings',
|
| - '../ui/views/views.gyp:views',
|
| - 'resources/athena_resources.gyp:athena_resources',
|
| - 'strings/athena_strings.gyp:athena_strings',
|
| - ],
|
| - '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_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_manager_observer.h',
|
| - 'activity/public/activity_view.h',
|
| - 'activity/public/activity_view_model.h',
|
| - 'athena_export.h',
|
| - 'env/athena_env_impl.cc',
|
| - 'env/public/athena_env.h',
|
| - 'home/app_list_view_delegate.cc',
|
| - 'home/app_list_view_delegate.h',
|
| - 'home/home_card_constants.cc',
|
| - 'home/home_card_constants.h',
|
| - 'home/home_card_gesture_manager.cc',
|
| - 'home/home_card_gesture_manager.h',
|
| - 'home/home_card_impl.cc',
|
| - 'home/home_card_view.cc',
|
| - 'home/home_card_view.h',
|
| - 'home/public/app_model_builder.h',
|
| - 'home/public/home_card.h',
|
| - 'home/public/search_controller_factory.h',
|
| - 'input/accelerator_manager_impl.cc',
|
| - 'input/accelerator_manager_impl.h',
|
| - 'input/input_manager_impl.cc',
|
| - 'input/input_manager_impl.h',
|
| - 'input/power_button_controller.cc',
|
| - 'input/power_button_controller.h',
|
| - 'input/public/accelerator_manager.h',
|
| - 'input/public/input_manager.h',
|
| - 'resource_manager/delegate/resource_manager_delegate.cc',
|
| - 'resource_manager/memory_pressure_notifier.cc',
|
| - 'resource_manager/memory_pressure_notifier.h',
|
| - 'resource_manager/public/resource_manager.h',
|
| - 'resource_manager/public/resource_manager_delegate.h',
|
| - 'resource_manager/resource_manager_impl.cc',
|
| - 'screen/public/screen_manager.h',
|
| - 'screen/screen_accelerator_handler.cc',
|
| - 'screen/screen_accelerator_handler.h',
|
| - 'screen/screen_manager_impl.cc',
|
| - 'screen/modal_window_controller.cc',
|
| - 'screen/modal_window_controller.h',
|
| - 'system/background_controller.cc',
|
| - 'system/background_controller.h',
|
| - 'system/network_selector.cc',
|
| - 'system/network_selector.h',
|
| - 'system/orientation_controller.cc',
|
| - 'system/orientation_controller.h',
|
| - 'system/shutdown_dialog.cc',
|
| - 'system/shutdown_dialog.h',
|
| - 'system/status_icon_container_view.cc',
|
| - 'system/status_icon_container_view.h',
|
| - 'system/time_view.cc',
|
| - 'system/time_view.h',
|
| - 'system/public/system_ui.h',
|
| - 'system/system_ui_impl.cc',
|
| - 'util/athena_constants.cc',
|
| - 'util/athena_constants.h',
|
| - 'util/container_priorities.h',
|
| - 'util/drag_handle.cc',
|
| - 'util/drag_handle.h',
|
| - 'util/fill_layout_manager.cc',
|
| - 'util/fill_layout_manager.h',
|
| - 'util/switches.cc',
|
| - 'util/switches.h',
|
| - 'wm/overview_toolbar.cc',
|
| - 'wm/overview_toolbar.h',
|
| - 'wm/public/window_list_provider.h',
|
| - 'wm/public/window_list_provider_observer.h',
|
| - 'wm/public/window_manager.h',
|
| - 'wm/public/window_manager_observer.h',
|
| - 'wm/split_view_controller.cc',
|
| - 'wm/split_view_controller.h',
|
| - 'wm/title_drag_controller.cc',
|
| - 'wm/title_drag_controller.h',
|
| - 'wm/window_list_provider_impl.cc',
|
| - 'wm/window_list_provider_impl.h',
|
| - 'wm/window_manager_impl.cc',
|
| - 'wm/window_manager_impl.h',
|
| - 'wm/window_overview_mode.cc',
|
| - 'wm/window_overview_mode.h',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'athena_content_lib',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - 'athena_lib',
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - '../components/components.gyp:app_modal',
|
| - '../components/components.gyp:constrained_window',
|
| - '../components/components.gyp:component_metrics_proto',
|
| - '../components/components.gyp:omnibox',
|
| - '../components/components.gyp:renderer_context_menu',
|
| - '../components/components.gyp:web_modal',
|
| - '../content/content.gyp:content_browser',
|
| - '../extensions/components/extensions_components.gyp:javascript_dialog_extensions_client',
|
| - '../extensions/components/extensions_components.gyp:native_app_window',
|
| - '../extensions/extensions.gyp:extensions_browser',
|
| - '../extensions/extensions.gyp:extensions_common',
|
| - '../ui/app_list/app_list.gyp:app_list',
|
| - '../ui/content_accelerators/ui_content_accelerators.gyp:ui_content_accelerators',
|
| - '../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',
|
| - ],
|
| - '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_activity_factory.h',
|
| - 'content/content_proxy.cc',
|
| - 'content/content_proxy.h',
|
| - 'content/media_utils.h',
|
| - 'content/public/app_registry.h',
|
| - 'content/public/content_activity_factory_creator.h',
|
| - 'content/public/dialogs.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_activity_helpers.h',
|
| - 'content/web_contents_view_delegate_factory_impl.cc',
|
| - 'extensions/athena_app_delegate_base.cc',
|
| - 'extensions/athena_app_delegate_base.h',
|
| - 'extensions/athena_app_window_client_base.cc',
|
| - 'extensions/athena_app_window_client_base.h',
|
| - 'extensions/athena_constrained_window_views_client.cc',
|
| - 'extensions/athena_constrained_window_views_client.h',
|
| - 'extensions/athena_javascript_native_dialog_factory.cc',
|
| - 'extensions/athena_javascript_native_dialog_factory.h',
|
| - 'extensions/extension_app_model_builder.cc',
|
| - 'extensions/extensions_delegate.cc',
|
| - 'extensions/pubilc/apps_search_controller_factory.h',
|
| - 'extensions/public/extension_app_model_builder.h',
|
| - 'extensions/public/extensions_delegate.h',
|
| - 'screen_lock/public/screen_lock_manager.h',
|
| - 'screen_lock/screen_lock_manager_base.cc',
|
| - 'screen_lock/screen_lock_manager_base.h',
|
| - 'virtual_keyboard/public/virtual_keyboard_manager.h',
|
| - 'virtual_keyboard/virtual_keyboard_manager_impl.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'athena_chrome_lib',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../components/components.gyp:component_metrics_proto',
|
| - '../chrome/chrome.gyp:browser_chromeos',
|
| - '../chrome/chrome.gyp:browser_extensions',
|
| - '../components/components.gyp:omnibox',
|
| - ],
|
| - 'sources': [
|
| - 'content/chrome/dialogs.cc',
|
| - 'content/chrome/media_utils.cc',
|
| - 'content/chrome/web_activity_helpers.cc',
|
| - 'extensions/chrome/app_list_controller_delegate_athena.cc',
|
| - 'extensions/chrome/app_list_controller_delegate_athena.h',
|
| - '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/athena_extension_install_ui.cc',
|
| - 'extensions/chrome/athena_extension_install_ui.h',
|
| - 'extensions/chrome/chrome_search_controller_factory.cc',
|
| - 'extensions/chrome/chrome_search_controller_factory.h',
|
| - 'extensions/chrome/extensions_delegate_impl.cc',
|
| - 'screen_lock/chrome/chrome_screen_lock_manager.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/dialogs.cc',
|
| - 'content/shell/media_utils.cc',
|
| - 'content/shell/web_activity_helpers.cc',
|
| - '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_shell_scheme_classifier.cc',
|
| - 'extensions/shell/athena_shell_scheme_classifier.h',
|
| - 'extensions/shell/athena_apps_client_delegate.h',
|
| - 'extensions/shell/shell_search_controller_factory.cc',
|
| - 'extensions/shell/shell_search_controller_factory.h',
|
| - 'extensions/shell/url_search_provider.cc',
|
| - 'extensions/shell/url_search_provider.h',
|
| - 'screen_lock/shell/shell_screen_lock_manager.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',
|
| - '../ui/accessibility/accessibility.gyp:ax_gen',
|
| - '../ui/app_list/app_list.gyp:app_list',
|
| - '../ui/app_list/app_list.gyp:app_list_test_support',
|
| - '../ui/aura/aura.gyp:aura_test_support',
|
| - '../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': [
|
| - 'extensions/test/test_extensions_delegate.cc',
|
| - 'test/base/athena_test_base.cc',
|
| - 'test/base/athena_test_base.h',
|
| - 'test/base/athena_test_helper.cc',
|
| - 'test/base/athena_test_helper.h',
|
| - 'test/base/sample_activity.cc',
|
| - 'test/base/sample_activity.h',
|
| - 'test/base/sample_activity_factory.cc',
|
| - 'test/base/sample_activity_factory.h',
|
| - 'test/base/test_app_model_builder.cc',
|
| - 'test/base/test_app_model_builder.h',
|
| - 'test/base/test_resource_manager_delegate.cc',
|
| - 'test/base/test_windows.cc',
|
| - 'test/base/test_windows.h',
|
| - 'test/base/test_util.cc',
|
| - 'test/base/test_util.h',
|
| - 'wm/test/window_manager_impl_test_api.cc',
|
| - 'wm/test/window_manager_impl_test_api.h',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'athena_browsertest_support',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../testing/gtest.gyp:gtest',
|
| - 'athena_test_support',
|
| - 'main/athena_main.gyp:athena_main_lib',
|
| - 'resources/athena_resources.gyp:athena_pak',
|
| - ],
|
| - 'sources': [
|
| - 'test/base/activity_lifetime_tracker.h',
|
| - 'test/base/activity_lifetime_tracker.cc',
|
| - 'test/base/athena_browser_test.h',
|
| - 'test/base/athena_browser_test.cc',
|
| - 'test/base/athena_browser_test.h',
|
| - 'test/base/athena_test_launcher_delegate.cc',
|
| - 'test/base/athena_test_launcher_delegate.h',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'athena_browsertests',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - '../testing/gtest.gyp:gtest',
|
| - '../skia/skia.gyp:skia',
|
| - 'athena_browsertest_support',
|
| - 'athena_app_shell_lib',
|
| - 'athena_lib',
|
| - ],
|
| - 'defines': [
|
| - 'HAS_OUT_OF_PROC_TEST_RUNNER',
|
| - ],
|
| - 'sources': [
|
| - 'test/base/athena_browser_test_main.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'athena_unittests',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - '../skia/skia.gyp:skia',
|
| - '../testing/gtest.gyp:gtest',
|
| - 'athena_app_shell_lib',
|
| - 'athena_lib',
|
| - 'athena_test_support',
|
| - 'main/athena_main.gyp:athena_main_lib',
|
| - 'resources/athena_resources.gyp:athena_pak',
|
| - ],
|
| - 'sources': [
|
| - 'activity/activity_manager_unittest.cc',
|
| - 'content/app_activity_unittest.cc',
|
| - 'env/athena_env_unittest.cc',
|
| - 'home/home_card_gesture_manager_unittest.cc',
|
| - 'home/home_card_unittest.cc',
|
| - 'input/accelerator_manager_unittest.cc',
|
| - 'input/input_manager_unittest.cc',
|
| - 'resource_manager/memory_pressure_notifier_unittest.cc',
|
| - 'resource_manager/resource_manager_unittest.cc',
|
| - 'screen/modal_window_controller_unittest.cc',
|
| - 'screen/screen_manager_unittest.cc',
|
| - 'test/base/athena_unittests.cc',
|
| - 'util/drag_handle_unittest.cc',
|
| - 'util/fill_layout_manager_unittest.cc',
|
| - 'wm/split_view_controller_unittest.cc',
|
| - 'wm/window_list_provider_impl_unittest.cc',
|
| - 'wm/window_manager_unittest.cc',
|
| - ],
|
| - }
|
| - ],
|
| -}
|
| -
|
|
|