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

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

 // Copyright (c) 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.
 
 #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"
 #include "base/values.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/ime/ime_keyboard.h"
 #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;
   chromeos::input_method::ModifierKey value;
 } kModifierKeysSelectItems[] = {
   { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH,
     chromeos::input_method::kSearchKey },
   { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_CTRL,
     chromeos::input_method::kControlKey },
   { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_ALT,
@@ skipping 120 matching lines @@
 
 void KeyboardHandler::RegisterMessages() {
   // Callback to show keyboard overlay.
   web_ui()->RegisterMessageCallback(
       "showKeyboardShortcuts",
       base::Bind(&KeyboardHandler::HandleShowKeyboardShortcuts,
                  base::Unretained(this)));
 }
 
 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.
   ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
 #endif
 }
 
 }  // namespace options
 }  // namespace chromeos