chrome/browser/chromeos/settings/cros_settings.cc - Issue 23514056: Function-type templated CallbackRegistry

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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:

Index: chrome/browser/chromeos/settings/cros_settings.cc

diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc

index d7027073b5c48ac997f7b1f8103b3732d49b4ce5..9023c0aa1452436e0895512d4cfcd12cb7a7d69d 100644

--- a/chrome/browser/chromeos/settings/cros_settings.cc

+++ b/chrome/browser/chromeos/settings/cros_settings.cc

@@ -272,11 +272,11 @@ CrosSettings::AddSettingsObserver(const std::string& path,

}

// 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;