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

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index c4240ca34dcc3203db6d23e8eff25978fe6ef204..15f503ea08fedb76e8eab46b0538f71cb7144982 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -922,14 +922,10 @@
       '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',
@@ -1669,20 +1665,10 @@
       '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',
@@ -2471,6 +2457,20 @@
     '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': [