Move UserActivityDetector from ash/wm/ to ui/wm/core/.

chrome/browser/chromeos/login/webui_login_display.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_DISPLAY_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_DISPLAY_H_
 
 #include <string>
 #include <vector>
 
-#include "ash/wm/user_activity_observer.h"
 #include "base/compiler_specific.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/user_activity_observer.h"
 
 namespace chromeos {
 // WebUI-based login UI implementation.
 class WebUILoginDisplay : public LoginDisplay,
                           public NativeWindowDelegate,
                           public SigninScreenHandlerDelegate,
-                          public ash::UserActivityObserver {
+                          public wm::UserActivityObserver {
  public:
   explicit WebUILoginDisplay(LoginDisplay::Delegate* delegate);
   virtual ~WebUILoginDisplay();
 
   // LoginDisplay implementation:
   virtual void ClearAndEnablePassword() OVERRIDE;
   virtual void Init(const UserList& users,
                     bool show_guest,
                     bool show_users,
                     bool show_new_user) OVERRIDE;
@@ skipping 53 matching lines @@
   virtual bool IsShowGuest() const OVERRIDE;
   virtual bool IsShowUsers() const OVERRIDE;
   virtual bool IsShowNewUser() const OVERRIDE;
   virtual bool IsSigninInProgress() const OVERRIDE;
   virtual bool IsUserSigninCompleted() const OVERRIDE;
   virtual void SetDisplayEmail(const std::string& email) OVERRIDE;
   virtual void Signout() OVERRIDE;
   virtual void LoginAsKioskApp(const std::string& app_id,
                                bool diagnostic_mode) OVERRIDE;
 
-  // UserActivityDetector implementation:
+  // wm::UserActivityDetector implementation:
   virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
 
  private:
   void StartPasswordClearTimer();
   void OnPasswordClearTimerExpired();
 
   // Set of Users that are visible.
   UserList users_;
 
   // Whether to show guest login.
@@ skipping 10 matching lines @@
 
   // Reference to the WebUI handling layer for the login screen
   LoginDisplayWebUIHandler* webui_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_DISPLAY_H_