Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/chromeos/extensions/file_browser_event_router.cc

 // Copyright (c) 2012 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/extensions/file_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/prefs/public/pref_change_registrar.h"
@@ skipping 367 matching lines @@
       !extensions::ExtensionSystem::Get(profile_)->event_router()) {
     NOTREACHED();
     return;
   }
   extensions::ExtensionSystem::Get(profile_)->event_router()->
       DispatchEventToRenderers(
           extensions::event_names::kOnFileBrowserNetworkConnectionChanged,
           scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
 }
 
-void FileBrowserEventRouter::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
+void FileBrowserEventRouter::OnPreferenceChanged(PrefServiceBase* service,
+                                                 const std::string& pref_name) {
   if (!profile_ ||
       !extensions::ExtensionSystem::Get(profile_)->event_router()) {
     NOTREACHED();
     return;
   }
-  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    std::string* pref_name = content::Details<std::string>(details).ptr();
-    // If the policy just got disabled we have to unmount every device currently
-    // mounted. The opposite is fine - we can let the user re-plug her device to
-    // make it available.
-    if (*pref_name == prefs::kExternalStorageDisabled &&
-        profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
-      DiskMountManager* manager = DiskMountManager::GetInstance();
-      DiskMountManager::MountPointMap mounts(manager->mount_points());
-      for (DiskMountManager::MountPointMap::const_iterator it = mounts.begin();
-           it != mounts.end(); ++it) {
-        LOG(INFO) << "Unmounting " << it->second.mount_path
-                  << " because of policy.";
-        manager->UnmountPath(it->second.mount_path,
-                             chromeos::UNMOUNT_OPTIONS_NONE);
-      }
-      return;
-    } else if (*pref_name == prefs::kDisableDriveOverCellular ||
-        *pref_name == prefs::kDisableDriveHostedFiles ||
-        *pref_name == prefs::kDisableDrive ||
-        *pref_name == prefs::kUse24HourClock) {
-      extensions::ExtensionSystem::Get(profile_)->event_router()->
-          DispatchEventToRenderers(
-              extensions::event_names::kOnFileBrowserPreferencesChanged,
-              scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
+
+  // If the policy just got disabled we have to unmount every device currently
+  // mounted. The opposite is fine - we can let the user re-plug her device to
+  // make it available.
+  if (pref_name == prefs::kExternalStorageDisabled &&
+      profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
+    DiskMountManager* manager = DiskMountManager::GetInstance();
+    DiskMountManager::MountPointMap mounts(manager->mount_points());
+    for (DiskMountManager::MountPointMap::const_iterator it = mounts.begin();
+         it != mounts.end(); ++it) {
+      LOG(INFO) << "Unmounting " << it->second.mount_path
+                << " because of policy.";
+      manager->UnmountPath(it->second.mount_path,
+                           chromeos::UNMOUNT_OPTIONS_NONE);
     }
+    return;
+  } else if (pref_name == prefs::kDisableDriveOverCellular ||
+             pref_name == prefs::kDisableDriveHostedFiles ||
+             pref_name == prefs::kDisableDrive ||
+             pref_name == prefs::kUse24HourClock) {
+    extensions::ExtensionSystem::Get(profile_)->event_router()->
+        DispatchEventToRenderers(
+            extensions::event_names::kOnFileBrowserPreferencesChanged,
+            scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
   }
 }
 
 void FileBrowserEventRouter::OnProgressUpdate(
     const google_apis::OperationProgressStatusList& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   scoped_ptr<ListValue> event_list(
       file_manager_util::ProgressStatusVectorToListValue(
           profile_,
@@ skipping 456 matching lines @@
   return scoped_refptr<RefcountedProfileKeyedService>(
       new FileBrowserEventRouter(profile));
 }
 
 bool FileBrowserEventRouterFactory::ServiceHasOwnInstanceInIncognito() const {
   // Explicitly and always allow this router in guest login mode.   see
   // chrome/browser/profiles/profile_keyed_base_factory.h comment
   // for the details.
   return true;
 }