Make login code not depend on Ash when use_athena=1

chrome/browser/chromeos/login/ui/login_display_host_impl.h

Index: chrome/browser/chromeos/login/ui/login_display_host_impl.h
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
index 98eef179f7517d204413cacab0da886a78dd4186..50e50922d5d3d94f1bb572fa228293753ad1dd56 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "ash/shell_delegate.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -29,6 +28,10 @@
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/views/widget/widget_removals_observer.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/shell_delegate.h"
+#endif
+
 class PrefService;
 
 namespace content {
@@ -40,11 +43,14 @@ namespace chromeos {
 
 class DemoAppLauncher;
 class FocusRingController;
-class KeyboardDrivenOobeKeyHandler;
 class OobeUI;
 class WebUILoginDisplay;
 class WebUILoginView;
 
+#if !defined(USE_ATHENA)
+class KeyboardDrivenOobeKeyHandler;
+#endif
+
 // An implementation class for OOBE/login WebUI screen host.
 // It encapsulates controllers, background integration and flow.
 class LoginDisplayHostImpl : public LoginDisplayHost,
@@ -52,7 +58,9 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
                              public content::WebContentsObserver,
                              public chromeos::SessionManagerClient::Observer,
                              public chromeos::CrasAudioHandler::AudioObserver,
+#if !defined(USE_ATHENA)
                              public ash::VirtualKeyboardStateObserver,
+#endif
                              public keyboard::KeyboardControllerObserver,
                              public gfx::DisplayObserver,
                              public views::WidgetRemovalsObserver {
@@ -123,8 +131,10 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
   // Overridden from chromeos::CrasAudioHandler::AudioObserver:
   virtual void OnActiveOutputNodeChanged() override;
 
+#if !defined(USE_ATHENA)
   // Overridden from ash::KeyboardStateObserver:
   virtual void OnVirtualKeyboardStateChanged(bool activated) override;
+#endif
 
   // Overridden from keyboard::KeyboardControllerObserver:
   virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
@@ -293,8 +303,10 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
   // driven oobe.
   scoped_ptr<FocusRingController> focus_ring_controller_;
 
+#if !defined(USE_ATHENA)
   // Handles special keys for keyboard driven oobe.
   scoped_ptr<KeyboardDrivenOobeKeyHandler> keyboard_driven_oobe_key_handler_;
+#endif
 
   FinalizeAnimationType finalize_animation_type_;