Remove NOTIFICATION_SYSTEM_SETTING_CHANGED, switch CrosSettings to base::CallbackRegistry.

chrome/browser/chromeos/policy/device_local_account_policy_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_SERVICE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/policy/cloud/cloud_policy_core.h"
 #include "chrome/browser/policy/cloud/cloud_policy_store.h"
-#include "content/public/browser/notification_observer.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace chromeos {
 class CrosSettings;
 class DeviceSettingsService;
 class SessionManagerClient;
 }
@@ skipping 38 matching lines @@
   scoped_ptr<DeviceLocalAccountPolicyStore> store_;
   CloudPolicyCore core_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyBroker);
 };
 
 // Manages user policy blobs for device-local accounts present on the device.
 // The actual policy blobs are brokered by session_manager (to prevent file
 // manipulation), and we're making signature checks on the policy blobs to
 // ensure they're issued by the device owner.
-class DeviceLocalAccountPolicyService : public content::NotificationObserver,
-                                        public CloudPolicyStore::Observer {
+class DeviceLocalAccountPolicyService : public CloudPolicyStore::Observer {
  public:
   // Interface for interested parties to observe policy changes.
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Policy for the given |user_id| has changed.
     virtual void OnPolicyUpdated(const std::string& user_id) = 0;
 
     // The list of accounts has been updated.
@@ skipping 16 matching lines @@
   // does not belong to an existing device-local account.
   DeviceLocalAccountPolicyBroker* GetBrokerForUser(const std::string& user_id);
 
   // Indicates whether policy has been successfully fetched for the given
   // |user_id|.
   bool IsPolicyAvailableForUser(const std::string& user_id);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  // NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // CloudPolicyStore::Observer:
   virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE;
   virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE;
 
  private:
   struct PolicyBrokerWrapper {
     PolicyBrokerWrapper();
 
     // Return the |broker|, creating it first if necessary.
     DeviceLocalAccountPolicyBroker* GetBroker();
@@ skipping 13 matching lines @@
     DeviceLocalAccountPolicyService* parent;
     DeviceLocalAccountPolicyBroker* broker;
   };
 
   typedef std::map<std::string, PolicyBrokerWrapper> PolicyBrokerMap;
 
   // Re-queries the list of defined device-local accounts from device settings
   // and updates |policy_brokers_| to match that list.
   void UpdateAccountList();
 
+  // Calls |UpdateAccountList| if there are no previous calls pending.
+  void UpdateAccountListIfNonePending();
+
   // Deletes brokers in |map| and clears it.
   void DeleteBrokers(PolicyBrokerMap* map);
 
   // Find the broker for a given |store|. Returns NULL if |store| is unknown.
   DeviceLocalAccountPolicyBroker* GetBrokerForStore(CloudPolicyStore* store);
 
   chromeos::SessionManagerClient* session_manager_client_;
   chromeos::DeviceSettingsService* device_settings_service_;
   chromeos::CrosSettings* cros_settings_;
 
   DeviceManagementService* device_management_service_;
 
   // The device-local account policy brokers, keyed by user ID.
   PolicyBrokerMap policy_brokers_;
 
   ObserverList<Observer, true> observers_;
 
+  scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
+      local_accounts_subscription_;
+
   // Weak pointer factory for cros_settings_->PrepareTrustedValues() callbacks.
   base::WeakPtrFactory<DeviceLocalAccountPolicyService>
       cros_settings_callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyService);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_SERVICE_H_