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

This CL:
- Adds !defined(USE_ATHENA) ifdefs where Ash is used.
- Stops compiling KeyboardOverlayUI in Athena because it is not necessary
- Stops compiling in Athena for simplicity:
   DisplayOptionsHandler, PowerHandler, FirstRunUI

BUG=426561
TEST=None
TBR=oshima,estade,stevenjb

Review URL: https://codereview.chromium.org/684143003

Cr-Commit-Position: refs/heads/master@{#302376}

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -109,9 +109,7 @@
 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h"
 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"
-#include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
-#include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
 #include "chrome/browser/ui/webui/chromeos/network_ui.h"
@@ -126,6 +124,11 @@
 #include "chrome/browser/ui/webui/chromeos/slow_ui.h"
 #endif
 
+#if defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
+#include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
+#endif
+
 #if defined(USE_AURA)
 #include "chrome/browser/ui/webui/gesture_config_ui.h"
 #endif
@@ -422,12 +425,14 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<chromeos::CryptohomeUI>;
   if (url.host() == chrome::kChromeUIDriveInternalsHost)
     return &NewWebUI<chromeos::DriveInternalsUI>;
-  if (url.host() == chrome::kChromeUIFirstRunHost)
-    return &NewWebUI<chromeos::FirstRunUI>;
   if (url.host() == chrome::kChromeUIImageBurnerHost)
     return &NewWebUI<ImageBurnUI>;
+#if !defined(USE_ATHENA)
+  if (url.host() == chrome::kChromeUIFirstRunHost)
+    return &NewWebUI<chromeos::FirstRunUI>;
   if (url.host() == chrome::kChromeUIKeyboardOverlayHost)
     return &NewWebUI<KeyboardOverlayUI>;
+#endif
   if (url.host() == chrome::kChromeUIMobileSetupHost)
     return &NewWebUI<MobileSetupUI>;
   if (url.host() == chrome::kChromeUINfcDebugHost)

chrome/browser/ui/webui/chromeos/DEPS

 include_rules = [
   "+components/login",
   "+components/user_manager",
+  "+media/audio/sounds",
 ]

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

@@ -389,7 +389,8 @@ void CoreOobeHandler::UpdateKeyboardState() {
 }
 
 void CoreOobeHandler::UpdateClientAreaSize() {
-  const gfx::Size& size = ash::Shell::GetScreen()->GetPrimaryDisplay().size();
+  const gfx::Size& size =
+      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().size();
   SetClientAreaSize(size.width(), size.height());
 }
 

chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 
-#include "ash/audio/sounds.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ -19,11 +18,16 @@
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "grit/browser_resources.h"
+#include "media/audio/sounds/sounds_manager.h"
 #include "net/base/data_url.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/audio/sounds.h"
+#endif
+
 namespace {
 
 const char kJsScreenPath[] = "login.UserImageScreen";
@@ -185,11 +189,15 @@ void UserImageScreenHandler::HandlePhotoTaken(const std::string& image_url) {
 }
 
 void UserImageScreenHandler::HandleTakePhoto() {
+#if !defined(USE_ATHENA)
   ash::PlaySystemSoundIfSpokenFeedback(SOUND_CAMERA_SNAP);
+#endif
 }
 
 void UserImageScreenHandler::HandleDiscardPhoto() {
+#if !defined(USE_ATHENA)
   ash::PlaySystemSoundIfSpokenFeedback(SOUND_OBJECT_DELETE);
+#endif
 }
 
 void UserImageScreenHandler::HandleSelectImage(const std::string& image_url,

chrome/browser/ui/webui/chromeos/set_time_ui.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/set_time_ui.h"
 
-#include "ash/shell.h"
-#include "ash/system/tray/system_tray_delegate.h"
-#include "ash/system/user/login_status.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/build_time.h"
@@ -18,6 +15,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/system_clock_client.h"
+#include "chromeos/login/login_state.h"
 #include "chromeos/settings/timezone_settings.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -122,10 +120,8 @@ SetTimeUI::SetTimeUI(content::WebUI* web_ui) : WebDialogUI(web_ui) {
   // If we are not logged in, we need to show the time zone dropdown.
   // Otherwise, we can leave |currentTimezoneId| blank.
   std::string current_timezone_id;
-  if (ash::Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() ==
-      ash::user::LOGGED_IN_NONE) {
+  if (!LoginState::Get()->IsUserLoggedIn())
     CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
-  }
   values.SetString("currentTimezoneId", current_timezone_id);
   values.SetDouble("buildTime", base::GetBuildTime().ToJsTime());
 

chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -1705,7 +1705,11 @@ void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators(
 #if defined(OS_CHROMEOS)
 void BrowserOptionsHandler::HandleOpenWallpaperManager(
     const base::ListValue* args) {
+#if !defined(USE_ATHENA)
   ash::Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();
+#else
+  NOTIMPLEMENTED();
+#endif
 }
 
 void BrowserOptionsHandler::VirtualKeyboardChangeCallback(

chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

@@ -6,8 +6,6 @@
 
 #include <string>
 
-#include "ash/session/session_state_delegate.h"
-#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/strings/string_number_conversions.h"
@@ -33,6 +31,11 @@
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/session/session_state_delegate.h"
+#include "ash/shell.h"
+#endif
+
 namespace chromeos {
 namespace options {
 

chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

@@ -145,18 +145,14 @@ base::DictionaryValue* ConvertDisplayModeToValue(int64 display_id,
 }  // namespace
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
-#if !defined(USE_ATHENA)
   // ash::Shell doesn't exist in Athena.
   // See: http://crbug.com/416961
   ash::Shell::GetInstance()->display_controller()->AddObserver(this);
-#endif
 }
 
 DisplayOptionsHandler::~DisplayOptionsHandler() {
-#if !defined(USE_ATHENA)
   // ash::Shell doesn't exist in Athena.
   ash::Shell::GetInstance()->display_controller()->RemoveObserver(this);
-#endif
 }
 
 void DisplayOptionsHandler::GetLocalizedValues(
@@ -208,11 +204,9 @@ void DisplayOptionsHandler::GetLocalizedValues(
 
 void DisplayOptionsHandler::InitializePage() {
   DCHECK(web_ui());
-#if !defined(USE_ATHENA)
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.enableDisplayButton",
       base::FundamentalValue(true));
-#endif
 }
 
 void DisplayOptionsHandler::RegisterMessages() {

chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc

@@ -7,7 +7,6 @@
 #include "base/macros.h"
 #include "base/values.h"
 #include "chrome/grit/generated_resources.h"
-#include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {

chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

@@ -4,8 +4,6 @@
 
 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
 
-#include "ash/new_window_delegate.h"
-#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ -16,6 +14,11 @@
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/new_window_delegate.h"
+#include "ash/shell.h"
+#endif
+
 namespace {
 const struct ModifierKeysSelectItem {
   int message_id;
@@ -156,7 +159,7 @@ void KeyboardHandler::RegisterMessages() {
 }
 
 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) {
-#if defined(USE_ATHENA)
+#if !defined(USE_ATHENA)
   // Athena doesn't have ash::Shell and its new_window_delegate so keyboard
   // shortcut overlays are not supported.
   // TODO(mukai): re-enable this.

chrome/browser/ui/webui/options/options_ui.cc

@@ -88,17 +88,20 @@
 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/power_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 #endif
 
+#if defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/power_handler.h"
+#endif
+
 #if defined(USE_NSS)
 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
 #endif
@@ -319,16 +322,18 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
                           new chromeos::options::BluetoothOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options::DateTimeOptionsHandler());
+#if !defined(USE_ATHENA)
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options::DisplayOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options::DisplayOverscanHandler());
+  AddOptionsPageUIHandler(localized_strings,
+                          new chromeos::options::PowerHandler());
+#endif
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options::InternetOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options::KeyboardHandler());
-  AddOptionsPageUIHandler(localized_strings,
-                          new chromeos::options::PowerHandler());
 
   chromeos::options::PointerHandler* pointer_handler =
       new chromeos::options::PointerHandler();

chrome/chrome_browser_ui.gypi

@@ -917,14 +917,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',
@@ -1664,10 +1660,6 @@
       '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',
@@ -1676,8 +1668,6 @@
       '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 +2461,16 @@
     '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/power_handler.cc',
+      'browser/ui/webui/options/chromeos/power_handler.h',
     ],
     # Used when athena is enabled.
     'chrome_browser_ui_athena_sources': [