Make login code not depend on Ash when use_athena=1

chrome/browser/chromeos/login/lock/webui_screen_locker.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_LOCK_WEBUI_SCREEN_LOCKER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_
 
 #include <string>
 
 #include "ash/shell_delegate.h"
@@ skipping 31 matching lines @@
 namespace test {
 class WebUIScreenLockerTester;
 }
 
 // This version of ScreenLockerDelegate displays a WebUI lock screen based on
 // the Oobe account picker screen.
 class WebUIScreenLocker : public WebUILoginView,
                           public LoginDisplay::Delegate,
                           public ScreenLockerDelegate,
                           public LockWindow::Observer,
+#if !defined(USE_ATHENA)
                           public ash::LockStateObserver,
+#endif
                           public views::WidgetObserver,
                           public PowerManagerClient::Observer,
+#if !defined(USE_ATHENA)
                           public ash::VirtualKeyboardStateObserver,
+#endif
                           public keyboard::KeyboardControllerObserver {
  public:
   explicit WebUIScreenLocker(ScreenLocker* screen_locker);
 
   // ScreenLockerDelegate implementation.
   virtual void LockScreen() override;
   virtual void ScreenLockReady() override;
   virtual void OnAuthenticate() override;
   virtual void SetInputEnabled(bool enabled) override;
   virtual void ShowErrorMessage(
@@ skipping 26 matching lines @@
   virtual void Signout() override;
 
   // content::NotificationObserver (via WebUILoginView) implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
 
   // LockWindow::Observer implementation.
   virtual void OnLockWindowReady() override;
 
+#if !defined(USE_ATHENA)
   // LockStateObserver override.
   virtual void OnLockStateEvent(
       ash::LockStateObserver::EventType event) override;
+#endif
 
   // WidgetObserver override.
   virtual void OnWidgetDestroying(views::Widget* widget) override;
 
   // PowerManagerClient::Observer overrides:
   virtual void SuspendDone(const base::TimeDelta& sleep_duration) override;
   virtual void LidEventReceived(bool open,
                                 const base::TimeTicks& time) override;
 
   // Overridden from content::WebContentsObserver:
   virtual void RenderProcessGone(base::TerminationStatus status) 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;
 
   // Returns instance of the OOBE WebUI.
   OobeUI* GetOobeUI();
 
  private:
   friend class test::WebUIScreenLockerTester;
 
@@ skipping 29 matching lines @@
   gfx::Rect keyboard_bounds_;
 
   base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_