Upstream version 10.39.225.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 be0c782..cce4b80 100644 (file)
--- a/src/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/src/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -107,10 +107,13 @@ 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();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
+#endif
 }
 
 // static
@@ -208,10 +211,13 @@ 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();
   if (!activity_detector->HasObserver(this))
     activity_detector->AddObserver(this);
+#endif
 }
 
 void UserSelectionScreen::OnBeforeUserRemoved(const std::string& username) {