Move UserActivityDetector to ui/base/user_activity/.

chrome/browser/chromeos/login/screens/user_selection_screen.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/screenlock_bridge.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 namespace chromeos {
 
 namespace {
 
 // User dictionary keys.
 const char kKeyUsername[] = "username";
 const char kKeyDisplayName[] = "displayName";
 const char kKeyEmailAddress[] = "emailAddress";
 const char kKeyEnterpriseDomain[] = "enterpriseDomain";
@@ skipping 70 matching lines @@
 
 UserSelectionScreen::UserSelectionScreen(const std::string& display_type)
     : handler_(nullptr),
       login_display_delegate_(nullptr),
       view_(nullptr),
       display_type_(display_type) {
 }
 
 UserSelectionScreen::~UserSelectionScreen() {
   ScreenlockBridge::Get()->SetLockHandler(nullptr);
-  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
 }
 
 void UserSelectionScreen::InitEasyUnlock() {
   ScreenlockBridge::Get()->SetLockHandler(this);
 }
 
 void UserSelectionScreen::SetLoginDisplayDelegate(
     LoginDisplay::Delegate* login_display_delegate) {
@@ skipping 92 matching lines @@
 
 void UserSelectionScreen::SetView(UserBoardView* view) {
   view_ = view;
 }
 
 void UserSelectionScreen::Init(const user_manager::UserList& users,
                                bool show_guest) {
   users_ = users;
   show_guest_ = show_guest;
 
-  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
   if (!activity_detector->HasObserver(this))
     activity_detector->AddObserver(this);
 }
 
 void UserSelectionScreen::OnBeforeUserRemoved(const std::string& username) {
   for (user_manager::UserList::iterator it = users_.begin(); it != users_.end();
        ++it) {
     if ((*it)->email() == username) {
       users_.erase(it);
       break;
@@ skipping 244 matching lines @@
   // The user profile should exists if and only if this is lock screen.
   DCHECK_NE(!profile, !ScreenLocker::default_screen_locker());
 
   if (!profile)
     profile = profile_helper->GetSigninProfile();
 
   return EasyUnlockService::Get(profile);
 }
 
 }  // namespace chromeos