Index: chrome/browser/chromeos/settings/cros_settings.h |
diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h |
index 77f8194cc76575c30ec73d0a1a05a8dba131ad02..c96c09162a0a0ecb01116ad8d0b5f16a0ca5f474 100644 |
--- a/chrome/browser/chromeos/settings/cros_settings.h |
+++ b/chrome/browser/chromeos/settings/cros_settings.h |
@@ -9,7 +9,7 @@ |
#include <vector> |
#include "base/callback_forward.h" |
-#include "base/callback_registry.h" |
+#include "base/callback_list.h" |
#include "base/containers/hash_tables.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/threading/non_thread_safe.h" |
@@ -94,7 +94,7 @@ class CrosSettings : public base::NonThreadSafe { |
bool RemoveSettingsProvider(CrosSettingsProvider* provider); |
// Add an observer Callback for changes for the given |path|. |
- typedef base::CallbackRegistry<void(void)>::Subscription ObserverSubscription; |
+ typedef base::CallbackList<void(void)>::Subscription ObserverSubscription; |
scoped_ptr<ObserverSubscription> AddSettingsObserver( |
const std::string& path, |
const base::Closure& callback); |
@@ -113,7 +113,7 @@ class CrosSettings : public base::NonThreadSafe { |
// A map from settings names to a list of observers. Observers get fired in |
// the order they are added. |
- typedef base::hash_map<std::string, base::CallbackRegistry<void(void)>*> |
+ typedef base::hash_map<std::string, base::CallbackList<void(void)>*> |
SettingsObserverMap; |
SettingsObserverMap settings_observers_; |