Remove remainder of Athena related code from Chrome

chrome/chrome_browser_ui.gypi

 # Copyright 2012 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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 884 matching lines @@
       'browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc',
       'browser/ui/webui/chromeos/cryptohome_web_ui_handler.h',
       'browser/ui/webui/chromeos/device_log_ui.cc',
       'browser/ui/webui/chromeos/device_log_ui.h',
       'browser/ui/webui/chromeos/drive_internals_ui.cc',
       'browser/ui/webui/chromeos/drive_internals_ui.h',
       'browser/ui/webui/chromeos/first_run/first_run_actor.cc',
       'browser/ui/webui/chromeos/first_run/first_run_actor.h',
       'browser/ui/webui/chromeos/first_run/first_run_handler.cc',
       'browser/ui/webui/chromeos/first_run/first_run_handler.h',
+      'browser/ui/webui/chromeos/first_run/first_run_ui.cc',
+      'browser/ui/webui/chromeos/first_run/first_run_ui.h',
       'browser/ui/webui/chromeos/image_source.cc',
       'browser/ui/webui/chromeos/image_source.h',
       'browser/ui/webui/chromeos/imageburner/imageburner_ui.cc',
       'browser/ui/webui/chromeos/imageburner/imageburner_ui.h',
+      'browser/ui/webui/chromeos/keyboard_overlay_ui.cc',
+      'browser/ui/webui/chromeos/keyboard_overlay_ui.h',
       'browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc',
       'browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h',
       'browser/ui/webui/chromeos/login/authenticated_user_email_retriever.cc',
       'browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h',
       'browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.cc',
       'browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h',
       'browser/ui/webui/chromeos/login/base_screen_handler.cc',
       'browser/ui/webui/chromeos/login/base_screen_handler.h',
       'browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc',
       'browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h',
@@ skipping 191 matching lines @@
       'browser/ui/certificate_dialogs.h',
     ],
     # Cross-platform ash sources.
     'chrome_browser_ui_ash_sources': [
       'browser/ui/ash/accessibility/automation_manager_ash.cc',
       'browser/ui/ash/accessibility/automation_manager_ash.h',
       'browser/ui/ash/accessibility/ax_root_obj_wrapper.cc',
       'browser/ui/ash/accessibility/ax_root_obj_wrapper.h',
       'browser/ui/ash/accessibility/ax_tree_source_ash.cc',
       'browser/ui/ash/accessibility/ax_tree_source_ash.h',
+      'browser/ui/ash/app_list/app_list_controller_ash.cc',
+      'browser/ui/ash/app_list/app_list_controller_ash.h',
+      'browser/ui/ash/app_list/app_list_service_ash.cc',
+      'browser/ui/ash/app_list/app_list_service_ash.h',
+      'browser/ui/ash/ash_init.cc',
+      'browser/ui/ash/ash_init.h',
       'browser/ui/ash/ash_keyboard_controller_proxy.cc',
       'browser/ui/ash/ash_keyboard_controller_proxy.h',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.h',
       'browser/ui/ash/app_sync_ui_state.cc',
       'browser/ui/ash/app_sync_ui_state.h',
       'browser/ui/ash/app_sync_ui_state_observer.h',
       'browser/ui/ash/app_sync_ui_state_factory.cc',
       'browser/ui/ash/app_sync_ui_state_factory.h',
       'browser/ui/ash/ash_util.cc',
@@ skipping 73 matching lines @@
       'browser/ui/ash/system_tray_delegate_chromeos.cc',
       'browser/ui/ash/system_tray_delegate_chromeos.h',
       'browser/ui/ash/system_tray_delegate_common.cc',
       'browser/ui/ash/system_tray_delegate_common.h',
       'browser/ui/ash/system_tray_delegate_utils.cc',
       'browser/ui/ash/system_tray_delegate_utils.h',
       'browser/ui/ash/user_accounts_delegate_chromeos.cc',
       'browser/ui/ash/user_accounts_delegate_chromeos.h',
       'browser/ui/ash/volume_controller_chromeos.cc',
       'browser/ui/ash/volume_controller_chromeos.h',
+      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
+      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
       'browser/ui/views/touch_uma/touch_uma_ash.cc',
       'browser/ui/window_sizer/window_sizer_ash.cc',
     ],
-    # Used when Ash is enabled but not Athena.
-    'chrome_browser_ui_ash_non_athena_sources': [
-      'browser/ui/ash/ash_init.cc',
-      'browser/ui/ash/ash_init.h',
-      'browser/ui/ash/app_list/app_list_controller_ash.cc',
-      'browser/ui/ash/app_list/app_list_controller_ash.h',
-      'browser/ui/ash/app_list/app_list_service_ash.cc',
-      'browser/ui/ash/app_list/app_list_service_ash.h',
-      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
-      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
-    ],
     # Used when Ash is enabled but not ChromeOS.
     'chrome_browser_ui_ash_non_chromeos': [
       'browser/ui/ash/chrome_shell_delegate_views.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.h',
       'browser/ui/ash/session_state_delegate_views.cc',
       'browser/ui/ash/session_state_delegate_views.h',
     ],
     # Ash + Views.
     'chrome_browser_ui_ash_views_sources': [
       'browser/ui/views/frame/browser_frame_ash.cc',
       'browser/ui/views/frame/browser_frame_ash.h',
       'browser/ui/views/frame/browser_header_painter_ash.cc',
       'browser/ui/views/frame/browser_header_painter_ash.h',
       'browser/ui/views/frame/browser_non_client_frame_view_ash.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
       'browser/ui/views/frame/immersive_mode_controller_ash.cc',
       'browser/ui/views/frame/immersive_mode_controller_ash.h',
       'browser/ui/views/frame/web_app_left_header_view_ash.cc',
       'browser/ui/views/frame/web_app_left_header_view_ash.h',
       'browser/ui/views/tabs/window_finder_ash.cc',
     ],
     # Used when ash is disabled.
     'chrome_browser_ui_non_ash_sources': [
       'browser/ui/views/touch_uma/touch_uma.cc',
     ],
-    # Used when athena is enabled.
-    'chrome_browser_ui_athena_sources': [
-      #TODO(mukai): Port AppListService to Athena (crbug.com/417571)
-      'browser/ui/app_list/app_list_service_disabled.cc',
-
-      'browser/ui/athena/extensions/extension_install_ui_factory_athena.cc',
-      'browser/ui/views/athena/athena_util.cc',
-      'browser/ui/views/athena/athena_util.h',
-    ],
-    # Used when not using mobile and not using Athena.
-    'chrome_browser_ui_non_athena_non_mobile_sources': [
-      'browser/ui/extensions/extension_install_ui_factory.cc',
-      'browser/ui/webui/chromeos/keyboard_overlay_ui.cc',
-      'browser/ui/webui/chromeos/keyboard_overlay_ui.h',
-      'browser/ui/webui/chromeos/first_run/first_run_ui.cc',
-      'browser/ui/webui/chromeos/first_run/first_run_ui.h',
-      'browser/ui/webui/options/chromeos/display_options_handler.cc',
-      'browser/ui/webui/options/chromeos/display_options_handler.h',
-      'browser/ui/webui/options/chromeos/display_overscan_handler.cc',
-      'browser/ui/webui/options/chromeos/display_overscan_handler.h',
-      'browser/ui/webui/options/chromeos/power_handler.cc',
-      'browser/ui/webui/options/chromeos/power_handler.h',
-    ],
     # Cross-platform aura sources.
     'chrome_browser_ui_aura_sources': [
       'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc',
       'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
       'browser/ui/aura/native_window_tracker_aura.cc',
       'browser/ui/aura/native_window_tracker_aura.h',
       'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
       'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
       'browser/ui/gesture_prefs_observer_factory_aura.cc',
       'browser/ui/gesture_prefs_observer_factory_aura.h',
@@ skipping 418 matching lines @@
       'browser/ui/webui/options/chromeos/change_picture_options_handler.cc',
       'browser/ui/webui/options/chromeos/change_picture_options_handler.h',
       'browser/ui/webui/options/chromeos/consumer_management_handler.cc',
       'browser/ui/webui/options/chromeos/consumer_management_handler.h',
       'browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc',
       'browser/ui/webui/options/chromeos/core_chromeos_options_handler.h',
       'browser/ui/webui/options/chromeos/cros_language_options_handler.cc',
       'browser/ui/webui/options/chromeos/cros_language_options_handler.h',
       'browser/ui/webui/options/chromeos/date_time_options_handler.cc',
       'browser/ui/webui/options/chromeos/date_time_options_handler.h',
+      'browser/ui/webui/options/chromeos/display_options_handler.cc',
+      'browser/ui/webui/options/chromeos/display_options_handler.h',
+      'browser/ui/webui/options/chromeos/display_overscan_handler.cc',
+      'browser/ui/webui/options/chromeos/display_overscan_handler.h',
       'browser/ui/webui/options/chromeos/internet_options_handler.cc',
       'browser/ui/webui/options/chromeos/internet_options_handler.h',
       'browser/ui/webui/options/chromeos/internet_options_handler_strings.cc',
       'browser/ui/webui/options/chromeos/internet_options_handler_strings.h',
       'browser/ui/webui/options/chromeos/keyboard_handler.cc',
       'browser/ui/webui/options/chromeos/keyboard_handler.h',
       'browser/ui/webui/options/chromeos/pointer_handler.cc',
       'browser/ui/webui/options/chromeos/pointer_handler.h',
+      'browser/ui/webui/options/chromeos/power_handler.cc',
+      'browser/ui/webui/options/chromeos/power_handler.h',
       'browser/ui/webui/options/chromeos/proxy_handler.cc',
       'browser/ui/webui/options/chromeos/proxy_handler.h',
       'browser/ui/webui/options/chromeos/stats_options_handler.cc',
       'browser/ui/webui/options/chromeos/stats_options_handler.h',
       'browser/ui/webui/options/chromeos/user_image_source.cc',
       'browser/ui/webui/options/chromeos/user_image_source.h',
       'browser/ui/webui/options/clear_browser_data_handler.cc',
       'browser/ui/webui/options/clear_browser_data_handler.h',
       'browser/ui/webui/options/content_settings_handler.cc',
       'browser/ui/webui/options/content_settings_handler.h',
@@ skipping 750 matching lines @@
       'browser/ui/extensions/app_launch_params.cc',
       'browser/ui/extensions/app_launch_params.h',
       'browser/ui/extensions/extension_action_platform_delegate.h',
       'browser/ui/extensions/extension_action_view_controller.cc',
       'browser/ui/extensions/extension_action_view_controller.h',
       'browser/ui/extensions/extension_enable_flow.cc',
       'browser/ui/extensions/extension_enable_flow.h',
       'browser/ui/extensions/extension_enable_flow_delegate.h',
       'browser/ui/extensions/extension_install_ui_default.cc',
       'browser/ui/extensions/extension_install_ui_default.h',
+      'browser/ui/extensions/extension_install_ui_factory.cc',
       'browser/ui/extensions/extension_install_ui_factory.h',
       'browser/ui/extensions/extension_installed_bubble.cc',
       'browser/ui/extensions/extension_installed_bubble.h',
       'browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc',
       'browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h',
       'browser/ui/webui/extensions/extension_basic_info.cc',
       'browser/ui/webui/extensions/extension_basic_info.h',
       'browser/ui/webui/extensions/extension_error_ui_util.cc',
       'browser/ui/webui/extensions/extension_error_ui_util.h',
       'browser/ui/webui/extensions/extension_icon_source.cc',
@@ skipping 328 matching lines @@
             '../components/components.gyp:user_manager',
           ],
           'conditions': [
             ['chromeos == 0', {
               'sources': [ '<@(chrome_browser_ui_ash_non_chromeos)' ],
             }],
           ],
         }, { # use_ash==0
           'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ],
         }],
-        ['use_athena==1', {
-          'defines': ['USE_ATHENA=1'],
-          'sources': [ '<@(chrome_browser_ui_athena_sources)' ],
-          'dependencies': [
-            '<(DEPTH)/athena/athena.gyp:athena_lib',
-            '<(DEPTH)/athena/athena.gyp:athena_chrome_lib',
-            '<(DEPTH)/athena/athena.gyp:athena_content_lib',
-            '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib',
-          ],
-        }, { # use_athena==0
-          'conditions': [
-            ['OS!="android" and OS!="ios"', {
-              'sources': [ '<@(chrome_browser_ui_non_athena_non_mobile_sources)' ],
-            }],
-            ['use_ash==1', {
-              'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
-            }],
-          ],
-        }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_ui_views_sources)' ],
           'dependencies': [
             '<(DEPTH)/components/components.gyp:constrained_window',
           ],
           'conditions': [
             ['chromeos == 0 and OS!="mac"', {
               'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
             }],
             ['use_ash == 1', {
@@ skipping 280 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }