chrome/browser/ui/prefs/prefs_tab_helper.h - Issue 24648002: Rename CallbackRegistry to CallbackList

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/ui/prefs/prefs_tab_helper.h

Issue 24648002: Rename CallbackRegistry to CallbackList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Doc fix 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/ui/prefs/prefs_tab_helper.h

diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h

index 431c48ee12de9384075ad9efd9a3134a3ff6019b..9e9ea9c5cebfbabb6d446b625810af9d4d573765 100644

--- a/chrome/browser/ui/prefs/prefs_tab_helper.h

+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h

@@ -5,7 +5,7 @@

#ifndef CHROME_BROWSER_UI_PREFS_PREFS_TAB_HELPER_H_

#define CHROME_BROWSER_UI_PREFS_PREFS_TAB_HELPER_H_

-#include "base/callback_registry.h"

+#include "base/callback_list.h"

#include "base/compiler_specific.h"

#include "base/memory/weak_ptr.h"

#include "base/prefs/pref_change_registrar.h"

@@ -58,7 +58,7 @@ class PrefsTabHelper : public content::NotificationObserver,

content::NotificationRegistrar registrar_;

PrefChangeRegistrar pref_change_registrar_;

base::WeakPtrFactory<PrefsTabHelper> weak_ptr_factory_;

- scoped_ptr<base::CallbackRegistry<void(void)>::Subscription>

+ scoped_ptr<base::CallbackList<void(void)>::Subscription>

style_sheet_subscription_;

DISALLOW_COPY_AND_ASSIGN(PrefsTabHelper);