Make login code not depend on Ash when use_athena=1

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

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
 
 #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"
 #include "chrome/browser/chromeos/login/app_launch_controller.h"
 #include "chrome/browser/chromeos/login/auth/auth_prewarmer.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/rect.h"
 #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 {
 class RenderFrameHost;
 class WebContents;
 }
 
 namespace chromeos {
 
 class DemoAppLauncher;
 class FocusRingController;
 class KeyboardDrivenOobeKeyHandler;
 class OobeUI;
 class WebUILoginDisplay;
 class WebUILoginView;
 
 // An implementation class for OOBE/login WebUI screen host.
 // It encapsulates controllers, background integration and flow.
 class LoginDisplayHostImpl : public LoginDisplayHost,
                              public content::NotificationObserver,
                              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 {
  public:
   explicit LoginDisplayHostImpl(const gfx::Rect& background_bounds);
   virtual ~LoginDisplayHostImpl();
 
   // Returns the default LoginDisplayHost instance if it has been created.
   static LoginDisplayHost* default_host() {
     return default_host_;
@@ skipping 50 matching lines @@
 
   // Overridden from content::WebContentsObserver:
   virtual void RenderProcessGone(base::TerminationStatus status) override;
 
   // Overridden from chromeos::SessionManagerClient::Observer:
   virtual void EmitLoginPromptVisibleCalled() override;
 
   // 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;
 
   // Overridden from gfx::DisplayObserver:
   virtual void OnDisplayAdded(const gfx::Display& new_display) override;
   virtual void OnDisplayRemoved(const gfx::Display& old_display) override;
   virtual void OnDisplayMetricsChanged(const gfx::Display& display,
                                        uint32_t changed_metrics) override;
 
@@ skipping 148 matching lines @@
   // Called before host deletion.
   base::Closure completion_callback_;
 
   // Active instance of authentication prewarmer.
   scoped_ptr<AuthPrewarmer> auth_prewarmer_;
 
   // A focus ring controller to draw focus ring around view for keyboard
   // 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_;
 
   // Time when login prompt visible signal is received. Used for
   // calculations of delay before startup sound.
   base::TimeTicks login_prompt_visible_time_;
 
   // True when request to play startup sound was sent to
   // SoundsManager.
   bool startup_sound_played_;
@@ skipping 14 matching lines @@
 #endif
 
   base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_