Function-type templated CallbackRegistry

chrome/browser/chromeos/settings/cros_settings.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/settings/cros_settings.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 254 matching lines @@
   DCHECK(!callback.is_null());
   DCHECK(CalledOnValidThread());
 
   if (!GetProvider(path)) {
     NOTREACHED() << "Trying to add an observer for an unregistered setting: "
                  << path;
     return scoped_ptr<CrosSettings::ObserverSubscription>();
   }
 
   // Get the callback registry associated with the path.
-  base::CallbackRegistry<void>* registry = NULL;
+  base::CallbackRegistry<void(void)>* registry = NULL;
   SettingsObserverMap::iterator observer_iterator =
       settings_observers_.find(path);
   if (observer_iterator == settings_observers_.end()) {
-    registry = new base::CallbackRegistry<void>;
+    registry = new base::CallbackRegistry<void(void)>;
     settings_observers_[path] = registry;
   } else {
     registry = observer_iterator->second;
   }
 
   return registry->Add(callback);
 }
 
 CrosSettingsProvider* CrosSettings::GetProvider(
     const std::string& path) const {
@@ skipping 16 matching lines @@
 
 ScopedTestCrosSettings::ScopedTestCrosSettings() {
   CrosSettings::Initialize();
 }
 
 ScopedTestCrosSettings::~ScopedTestCrosSettings() {
   CrosSettings::Shutdown();
 }
 
 }  // namespace chromeos