Make UserActivityDetector a singleton

chrome/browser/chromeos/policy/recommendation_restorer.cc

 // Copyright 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/policy/recommendation_restorer.h"
 
-#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 82 matching lines @@
   if (!pref) {
     NOTREACHED();
     return;
   }
 
   if (!pref->GetRecommendedValue() || !pref->HasUserSetting())
     return;
 
   if (logged_in_) {
     allow_delay = false;
-  } else if (allow_delay && ash::Shell::HasInstance()) {
+  } else if (allow_delay) {
     // Skip the delay if there has been no user input since the browser started.
     const wm::UserActivityDetector* user_activity_detector =
-        ash::Shell::GetInstance()->user_activity_detector();
-    allow_delay = !user_activity_detector->last_activity_time().is_null();
+        wm::UserActivityDetector::Get();
+    if (user_activity_detector &&
+        user_activity_detector->last_activity_time().is_null()) {
+      allow_delay = false;
+    }
   }
 
   if (allow_delay)
     StartTimer();
   else
     pref_change_registrar_.prefs()->ClearPref(pref->name().c_str());
 }
 
 void RecommendationRestorer::RestoreAll() {
   Restore(false, prefs::kAccessibilityLargeCursorEnabled);
   Restore(false, prefs::kAccessibilitySpokenFeedbackEnabled);
   Restore(false, prefs::kAccessibilityHighContrastEnabled);
   Restore(false, prefs::kAccessibilityScreenMagnifierEnabled);
   Restore(false, prefs::kAccessibilityScreenMagnifierType);
   Restore(false, prefs::kAccessibilityVirtualKeyboardEnabled);
 }
 
 void RecommendationRestorer::StartTimer() {
   // Listen for user activity so that the timer can be reset while the user is
   // active, causing it to fire only when the user remains idle for
   // |kRestoreDelayInMs|.
-  if (ash::Shell::HasInstance()) {
-    wm::UserActivityDetector* user_activity_detector =
-        ash::Shell::GetInstance()->user_activity_detector();
-    if (!user_activity_detector->HasObserver(this))
-      user_activity_detector->AddObserver(this);
-  }
+  wm::UserActivityDetector* user_activity_detector =
+      wm::UserActivityDetector::Get();
+  if (user_activity_detector && !user_activity_detector->HasObserver(this))
+    user_activity_detector->AddObserver(this);
 
   // There should be a separate timer for each pref. However, in the common
   // case of the user changing settings, a single timer is sufficient. This is
   // because a change initiated by the user implies user activity, so that even
   // if there was a separate timer per pref, they would all be reset at that
   // point, causing them to fire at exactly the same time. In the much rarer
   // case of a recommended value changing, a single timer is a close
   // approximation of the behavior that would be obtained by resetting the timer
   // for the affected pref only.
   restore_timer_.Start(FROM_HERE,
                        base::TimeDelta::FromMilliseconds(kRestoreDelayInMs),
                        base::Bind(&RecommendationRestorer::RestoreAll,
                                   base::Unretained(this)));
 }
 
 void RecommendationRestorer::StopTimer() {
   restore_timer_.Stop();
-  if (ash::Shell::HasInstance())
-    ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
+  if (wm::UserActivityDetector::Get())
+    wm::UserActivityDetector::Get()->RemoveObserver(this);
 }
 
 }  // namespace policy