Minimal support for OOBE/login for chrome-athena

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

Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index be0c7821acfd10d7b47173d3abcf46aef4a953f3..73b1bfb3336194ad12e4f526e360029ca9a68009 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -107,10 +107,12 @@ UserSelectionScreen::UserSelectionScreen() : handler_(NULL) {
 }
 
 UserSelectionScreen::~UserSelectionScreen() {
+#if !defined(USE_ATHENA)

[oshima, 2014/09/09 06:32:50]

can you add crbug.com/408752 ? (not exactly same, but related)

[Dmitry Polukhin, 2014/09/10 20:30:23]

Done.

   wm::UserActivityDetector* activity_detector =
       ash::Shell::GetInstance()->user_activity_detector();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
+#endif
 }
 
 // static
@@ -208,10 +210,12 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,
   users_ = users;
   show_guest_ = show_guest;
 
+#if !defined(USE_ATHENA)

[oshima, 2014/09/09 06:32:50]

ditto

[Dmitry Polukhin, 2014/09/10 20:30:23]

Done.

   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) {