| Index: chrome/browser/api/prefs/pref_member.h
|
| diff --git a/chrome/browser/api/prefs/pref_member.h b/chrome/browser/api/prefs/pref_member.h
|
| index 1441320893210e203966032657a96ca01be1b49a..495ea067f20991c1980c6df271a97e0f59620efa 100644
|
| --- a/chrome/browser/api/prefs/pref_member.h
|
| +++ b/chrome/browser/api/prefs/pref_member.h
|
| @@ -8,7 +8,7 @@
|
| // class MyClass {
|
| // public:
|
| // MyClass(PrefService* prefs) {
|
| -// my_string_.Init(prefs::kHomePage, prefs, NULL /* no observer */);
|
| +// my_string_.Init(prefs::kHomePage, prefs);
|
| // }
|
| // private:
|
| // StringPrefMember my_string_;
|
| @@ -103,6 +103,7 @@ class PrefMemberBase : public PrefObserver {
|
| // See PrefMember<> for description.
|
| void Init(const char* pref_name, PrefServiceBase* prefs,
|
| const NamedChangeCallback& observer);
|
| + void Init(const char* pref_name, PrefServiceBase* prefs);
|
|
|
| virtual void CreateInternal() const = 0;
|
|
|
| @@ -178,17 +179,6 @@ class PrefMember : public subtle::PrefMemberBase {
|
| subtle::PrefMemberBase::Init(pref_name, prefs);
|
| }
|
|
|
| - // Deprecated version of Init.
|
| - void Init(const char* pref_name, PrefServiceBase* prefs,
|
| - PrefObserver* observer) {
|
| - if (observer) {
|
| - Init(pref_name, prefs, base::Bind(&PrefObserver::OnPreferenceChanged,
|
| - base::Unretained(observer), prefs));
|
| - } else {
|
| - Init(pref_name, prefs, NamedChangeCallback());
|
| - }
|
| - }
|
| -
|
| // Unsubscribes the PrefMember from the PrefService. After calling this
|
| // function, the PrefMember may not be used any more on the UI thread.
|
| // Assuming |MoveToThread| was previously called, |GetValue|, |IsManaged|,
|
|
|