Make chrome/browser/ui/webui not depend on ash when using Athena

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': {
     'chrome_browser_ui_non_ios_sources': [
       'browser/ui/accelerator_utils.h',
       'browser/ui/android/android_about_app_info.cc',
       'browser/ui/android/android_about_app_info.h',
@@ skipping 904 matching lines @@
       'browser/ui/webui/chromeos/cryptohome_ui.cc',
       'browser/ui/webui/chromeos/cryptohome_ui.h',
       'browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc',
       'browser/ui/webui/chromeos/cryptohome_web_ui_handler.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 719 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',

[stevenjb, 2014/10/31 19:20:34]

Is there an issue tracking what the plan is for Settings?
internet_options_handler* should no longer have any Ash dependencies; I'm pretty
sure we are going to need it for Athena, one way or another.

       '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 768 matching lines @@
       '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',
     ],
     # Used when not using android and not using Athena.
     'chrome_browser_ui_non_athena_non_android_sources': [
       'browser/ui/extensions/application_launch_web_app.cc',
       '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/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/power_handler.cc',
+      'browser/ui/webui/options/chromeos/power_handler.h',
     ],
     # 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/application_launch_web_app_athena.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',
@@ skipping 560 matching lines @@
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
           'sources': [ '<@(chrome_browser_ui_non_mobile_sources)' ],
         }],
       ],
     },
   ],
 }