Move UserActivityDetector to ui/base/user_activity/.

chrome/browser/chromeos/login/screens/user_selection_screen.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_SCREENS_USER_SELECTION_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/ui/models/user_board_model.h"
 #include "chrome/browser/signin/screenlock_bridge.h"
 #include "components/user_manager/user.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 
 class EasyUnlockService;
 
 namespace chromeos {
 
 class LoginDisplayWebUIHandler;
 class UserBoardView;
 
 // This class represents User Selection screen: user pod-based login screen.
-class UserSelectionScreen : public wm::UserActivityObserver,
+class UserSelectionScreen : public ui::UserActivityObserver,
                             public ScreenlockBridge::LockHandler,
                             public UserBoardModel {
  public:
   explicit UserSelectionScreen(const std::string& display_type);
   virtual ~UserSelectionScreen();
 
   void SetLoginDisplayDelegate(LoginDisplay::Delegate* login_display_delegate);
   void SetHandler(LoginDisplayWebUIHandler* handler);
   void SetView(UserBoardView* view);
 
   static const user_manager::UserList PrepareUserListForSending(
       const user_manager::UserList& users,
       std::string owner,
       bool is_signin_to_add);
 
 
   virtual void Init(const user_manager::UserList& users, bool show_guest);
   const user_manager::UserList& GetUsers() const;
   void OnUserImageChanged(const user_manager::User& user);
   void OnBeforeUserRemoved(const std::string& username);
   void OnUserRemoved(const std::string& username);
 
   void OnPasswordClearTimerExpired();
 
   void HandleGetUsers();
 
-  // wm::UserActivityDetector implementation:
+  // ui::UserActivityDetector implementation:
   virtual void OnUserActivity(const ui::Event* event) override;
 
   void InitEasyUnlock();
 
   // ScreenlockBridge::LockHandler implementation:
   virtual void ShowBannerMessage(const base::string16& message) override;
   virtual void ShowUserPodCustomIcon(
       const std::string& user_email,
       const ScreenlockBridge::UserPodCustomIconOptions& icon) override;
   virtual void HideUserPodCustomIcon(const std::string& user_email) override;
@@ skipping 56 matching lines @@
 
   // Timer for measuring idle state duration before password clear.
   base::OneShotTimer<UserSelectionScreen> password_clear_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_