| Index: chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| index aaffe8ae39b891d68c84e3ab28e56de2a38ba527..32460d6febee97fd10255800bdeed33ca5ee81b6 100644
|
| --- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| +++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| @@ -21,8 +21,8 @@
|
| #include "ui/base/ime/chromeos/ime_keyboard.h"
|
| #include "ui/base/ime/chromeos/input_method_manager.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| +#include "ui/base/user_activity/user_activity_detector.h"
|
| #include "ui/views/widget/widget.h"
|
| -#include "ui/wm/core/user_activity_detector.h"
|
|
|
| #if !defined(USE_ATHENA)
|
| #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
|
| @@ -35,7 +35,7 @@ namespace chromeos {
|
| WebUILoginDisplay::~WebUILoginDisplay() {
|
| if (webui_handler_)
|
| webui_handler_->ResetSigninScreenHandlerDelegate();
|
| - wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
|
| + ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
|
| if (activity_detector->HasObserver(this))
|
| activity_detector->RemoveObserver(this);
|
| }
|
| @@ -65,7 +65,7 @@ void WebUILoginDisplay::Init(const user_manager::UserList& users,
|
| show_users_ = show_users;
|
| show_new_user_ = show_new_user;
|
|
|
| - wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
|
| + ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
|
| if (!activity_detector->HasObserver(this))
|
| activity_detector->AddObserver(this);
|
| }
|
|
|