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

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

Index: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
index ac46347714db012cde7df2717749c1f4bf8a857a..8af6dae9f4a31e60e55481cf954acab51a5b9123 100644
--- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
+++ b/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.