Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6159)

Unified Diff: chrome/browser/managed_prefs_banner_base.cc

Issue 2905003: Implement support for disabling sync through configuration management. (Closed)
Patch Set: Fix PrefsControllerTest on MAC. Created 10 years, 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/managed_prefs_banner_base.h ('k') | chrome/browser/profile.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/managed_prefs_banner_base.cc
diff --git a/chrome/browser/managed_prefs_banner_base.cc b/chrome/browser/managed_prefs_banner_base.cc
index 5251d7fe4e3b95540f4d956060414afbefce285e..09dcde6445f30a972bd7cd2a2a7c43b45952da5f 100644
--- a/chrome/browser/managed_prefs_banner_base.cc
+++ b/chrome/browser/managed_prefs_banner_base.cc
@@ -12,11 +12,15 @@
ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* prefs,
const wchar_t** relevant_prefs,
size_t count)
- : prefs_(prefs),
- relevant_prefs_(relevant_prefs, relevant_prefs + count) {
- for (PrefSet::const_iterator pref(relevant_prefs_.begin());
- pref != relevant_prefs_.end(); ++pref)
- prefs_->AddPrefObserver(pref->c_str(), this);
+ : prefs_(prefs) {
+ for (size_t i = 0; i < count; ++i) {
+ // Ignore prefs that are not registered.
+ const wchar_t* pref = relevant_prefs[i];
+ if (prefs->FindPreference(pref)) {
+ prefs_->AddPrefObserver(pref, this);
+ relevant_prefs_.insert(pref);
+ }
+ }
}
ManagedPrefsBannerBase::~ManagedPrefsBannerBase() {
« no previous file with comments | « chrome/browser/managed_prefs_banner_base.h ('k') | chrome/browser/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698