diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 16:22:15 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 16:22:15 +0000 |
| commit | 2d2b1d8d1edef8b97e27c85f9ee98174549becda (patch) | |
| tree | bc4f6ab90f648222e709adb0c9d25385c35a5849 /chrome/browser/prefs | |
| parent | 16d0a750bf228c062f2b065a67a56230fbe1dc45 (diff) | |
| download | chromium_src-2d2b1d8d1edef8b97e27c85f9ee98174549becda.zip chromium_src-2d2b1d8d1edef8b97e27c85f9ee98174549becda.tar.gz chromium_src-2d2b1d8d1edef8b97e27c85f9ee98174549becda.tar.bz2 | |
Observe kClearPluginLSODataEnabled in the correct PrefService in ContentSettingsHandler.
Also, check on initialization of a PrefMember that the preference is registered, to prevent this in the future.
BUG=95030
TEST=no crash
Review URL: http://codereview.chromium.org/7828028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/pref_member.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/prefs/pref_member.cc b/chrome/browser/prefs/pref_member.cc index 43fee58..94be45b 100644 --- a/chrome/browser/prefs/pref_member.cc +++ b/chrome/browser/prefs/pref_member.cc @@ -22,7 +22,8 @@ PrefMemberBase::~PrefMemberBase() { } -void PrefMemberBase::Init(const char* pref_name, PrefService* prefs, +void PrefMemberBase::Init(const char* pref_name, + PrefService* prefs, NotificationObserver* observer) { DCHECK(pref_name); DCHECK(prefs); @@ -30,7 +31,8 @@ void PrefMemberBase::Init(const char* pref_name, PrefService* prefs, observer_ = observer; prefs_ = prefs; pref_name_ = pref_name; - DCHECK(!pref_name_.empty()); + // Check that the preference is registered. + DCHECK(prefs_->FindPreference(pref_name_.c_str())); // Add ourselves as a pref observer so we can keep our local value in sync. prefs_->AddPrefObserver(pref_name, this); |