Make UserActivityDetector a singleton

chrome/browser/chromeos/login/ui/webui_login_display.cc

 // Copyright 2014 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/ui/webui_login_display.h"
 
-#include "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #endif
 
 namespace chromeos {
 
 // WebUILoginDisplay, public: --------------------------------------------------
 
 WebUILoginDisplay::~WebUILoginDisplay() {
   if (webui_handler_)
     webui_handler_->ResetSigninScreenHandlerDelegate();
-#if !defined(USE_ATHENA)
-  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
 }
 
 // LoginDisplay implementation: ------------------------------------------------
 
 WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
     : LoginDisplay(delegate, gfx::Rect()),
       show_guest_(false),
       show_new_user_(false),
       webui_handler_(NULL),
       gaia_screen_(new GaiaScreen()),
@@ skipping 10 matching lines @@
                              bool show_users,
                              bool show_new_user) {
   // Testing that the delegate has been set.
   DCHECK(delegate_);
 
   user_selection_screen_->Init(users, show_guest);
   show_guest_ = show_guest;
   show_users_ = show_users;
   show_new_user_ = show_new_user;
 
-#if !defined(USE_ATHENA)
-  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
 }
 
 // ---- Common methods
 
 // ---- User selection screen methods
 
 void WebUILoginDisplay::OnBeforeUserRemoved(const std::string& username) {
   user_selection_screen_->OnBeforeUserRemoved(username);
 }
 
@@ skipping 268 matching lines @@
   delegate_->Signout();
 }
 
 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
   if (delegate_)
     delegate_->ResetPublicSessionAutoLoginTimer();
 }
 
 
 }  // namespace chromeos