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

chrome/browser/chromeos/login/webui_login_display.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 
 #include "ash/shell.h"
-#include "ash/wm/user_activity_detector.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/user_activity_detector.h"
 
 namespace chromeos {
 
 namespace {
 
 const int kPasswordClearTimeoutSec = 60;
 
 }
 
 // WebUILoginDisplay, public: --------------------------------------------------
 
 WebUILoginDisplay::~WebUILoginDisplay() {
   if (webui_handler_)
     webui_handler_->ResetSigninScreenHandlerDelegate();
-  ash::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
+  wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
       user_activity_detector();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
 }
 
 // LoginDisplay implementation: ------------------------------------------------
 
 WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
     : LoginDisplay(delegate, gfx::Rect()),
       show_guest_(false),
@@ skipping 11 matching lines @@
                              bool show_users,
                              bool show_new_user) {
   // Testing that the delegate has been set.
   DCHECK(delegate_);
 
   users_ = users;
   show_guest_ = show_guest;
   show_users_ = show_users;
   show_new_user_ = show_new_user;
 
-  ash::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
+  wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
       user_activity_detector();
   if (!activity_detector->HasObserver(this))
     activity_detector->AddObserver(this);
 }
 
 void WebUILoginDisplay::OnPreferencesChanged() {
   if (webui_handler_)
     webui_handler_->OnPreferencesChanged();
 }
 
@@ skipping 340 matching lines @@
       base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this,
       &WebUILoginDisplay::OnPasswordClearTimerExpired);
 }
 
 void WebUILoginDisplay::OnPasswordClearTimerExpired() {
   if (webui_handler_)
     webui_handler_->ClearUserPodPassword();
 }
 
 }  // namespace chromeos