Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / screens / user_selection_screen.cc

diff --git a/src/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/src/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index cce4b80..be4ae6f 100644 (file)
--- a/src/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/src/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 
-#include "ash/shell.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ -18,7 +17,6 @@
 #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 "chrome/common/pref_names.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "ui/wm/core/user_activity_detector.h"
@@ -107,13 +105,9 @@ UserSelectionScreen::UserSelectionScreen() : handler_(NULL) {
 }
 
 UserSelectionScreen::~UserSelectionScreen() {
-#if !defined(USE_ATHENA)
-  // TODO(dpolukhin): crbug.com/408752
-  wm::UserActivityDetector* activity_detector =
-      ash::Shell::GetInstance()->user_activity_detector();
+  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
-#endif
 }
 
 // static
@@ -211,13 +205,9 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,
   users_ = users;
   show_guest_ = show_guest;
 
-#if !defined(USE_ATHENA)
-  // TODO(dpolukhin): crbug.com/408752
-  wm::UserActivityDetector* activity_detector =
-      ash::Shell::GetInstance()->user_activity_detector();
+  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
   if (!activity_detector->HasObserver(this))
     activity_detector->AddObserver(this);
-#endif
 }
 
 void UserSelectionScreen::OnBeforeUserRemoved(const std::string& username) {