Excludes settings which uses Ash from 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 498673fca0ff17b47f73ff5ce8da2092ea1fec0f..ac46347714db012cde7df2717749c1f4bf8a857a 100644
--- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
@@ -156,7 +156,12 @@ void KeyboardHandler::RegisterMessages() {
 }
 
 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) {
+#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