Make UserActivityDetector a singleton

chrome/browser/chromeos/system/automatic_reboot_manager.cc

 // Copyright (c) 2013 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/system/automatic_reboot_manager.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <algorithm>
 #include <string>
 
-#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 140 matching lines @@
       content::NotificationService::AllSources());
 
   DBusThreadManager* dbus_thread_manager = DBusThreadManager::Get();
   dbus_thread_manager->GetPowerManagerClient()->AddObserver(this);
   dbus_thread_manager->GetUpdateEngineClient()->AddObserver(this);
 
   // If no user is logged in, a reboot may be performed whenever the user is
   // idle. Start listening for user activity to determine whether the user is
   // idle or not.
   if (!user_manager::UserManager::Get()->IsUserLoggedIn()) {
-    if (ash::Shell::HasInstance())
-      ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);
+    if (wm::UserActivityDetector::Get())
+      wm::UserActivityDetector::Get()->AddObserver(this);
     notification_registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
         content::NotificationService::AllSources());
     login_screen_idle_timer_.reset(
         new base::OneShotTimer<AutomaticRebootManager>);
     OnUserActivity(NULL);
   }
 
   // In a regular browser, base::ThreadTaskRunnerHandle::Get() and
   // base::MessageLoopProxy::current() return pointers to the same object.
   // In unit tests, using base::ThreadTaskRunnerHandle::Get() has the advantage
   // that it allows a custom base::SingleThreadTaskRunner to be injected.
   content::BrowserThread::GetBlockingPool()->PostWorkerTaskWithShutdownBehavior(
       FROM_HERE,
       base::Bind(&GetSystemEventTimes,
                  base::ThreadTaskRunnerHandle::Get(),
                  base::Bind(&AutomaticRebootManager::Init,
                             weak_ptr_factory_.GetWeakPtr())),
       base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 }
 
 AutomaticRebootManager::~AutomaticRebootManager() {
   FOR_EACH_OBSERVER(AutomaticRebootManagerObserver,
                     observers_,
                     WillDestroyAutomaticRebootManager());
 
   DBusThreadManager* dbus_thread_manager = DBusThreadManager::Get();
   dbus_thread_manager->GetPowerManagerClient()->RemoveObserver(this);
   dbus_thread_manager->GetUpdateEngineClient()->RemoveObserver(this);
-  if (ash::Shell::HasInstance())
-    ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
+  if (wm::UserActivityDetector::Get())
+    wm::UserActivityDetector::Get()->RemoveObserver(this);
 }
 
 void AutomaticRebootManager::AddObserver(
     AutomaticRebootManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AutomaticRebootManager::RemoveObserver(
     AutomaticRebootManagerObserver* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 46 matching lines @@
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_APP_TERMINATING) {
     if (user_manager::UserManager::Get()->IsUserLoggedIn()) {
       // The browser is terminating during a session, either because the session
       // is ending or because the browser is being restarted.
       MaybeReboot(true);
     }
   } else if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
     // A session is starting. Stop listening for user activity as it no longer
     // is a relevant criterion.
-    if (ash::Shell::HasInstance())
-      ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
+    if (wm::UserActivityDetector::Get())
+      wm::UserActivityDetector::Get()->RemoveObserver(this);
     notification_registrar_.Remove(
         this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
         content::NotificationService::AllSources());
     login_screen_idle_timer_.reset();
   } else {
     NOTREACHED();
   }
 }
 
 // static
@@ skipping 125 matching lines @@
   }
 
   login_screen_idle_timer_.reset();
   grace_start_timer_.reset();
   grace_end_timer_.reset();
   DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
 }
 
 }  // namespace system
 }  // namespace chromeos