Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2231)

Unified Diff: chrome/browser/chromeos/settings/cros_settings.h

Issue 23514056: Function-type templated CallbackRegistry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge 2 Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/callback_registry_unittest.nc ('k') | chrome/browser/chromeos/settings/cros_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 403a5a6e9cde2ac7e1e9d916a95d10334dfe01ac..77f8194cc76575c30ec73d0a1a05a8dba131ad02 100644
--- a/chrome/browser/chromeos/settings/cros_settings.h
+++ b/chrome/browser/chromeos/settings/cros_settings.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>::Subscription ObserverSubscription;
+ typedef base::CallbackRegistry<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>*>
+ typedef base::hash_map<std::string, base::CallbackRegistry<void(void)>*>
SettingsObserverMap;
SettingsObserverMap settings_observers_;
« no previous file with comments | « base/callback_registry_unittest.nc ('k') | chrome/browser/chromeos/settings/cros_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698