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

Unified Diff: chrome/browser/content_settings/policy_content_settings_provider.cc

Issue 6410022: Add content_settings::PrefProvider to HostContentSettingsMap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 11 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
Index: chrome/browser/content_settings/policy_content_settings_provider.cc
diff --git a/chrome/browser/content_settings/policy_content_settings_provider.cc b/chrome/browser/content_settings/policy_content_settings_provider.cc
index fab9d543e2d53ed45e8973dee636d18a83693a3c..eb37c692dd963a0d7ec2bc56e65f90331fbfa21c 100644
--- a/chrome/browser/content_settings/policy_content_settings_provider.cc
+++ b/chrome/browser/content_settings/policy_content_settings_provider.cc
@@ -18,7 +18,7 @@
#include "chrome/common/notification_source.h"
#include "chrome/common/pref_names.h"
-namespace {
+namespace content_settings {
jochen (gone - plz use gerrit) 2011/02/04 08:38:43 this should stay an anonymous namespace
markusheintz_ 2011/02/04 10:08:03 Uuups sry. Done
// Base pref path of the prefs that contain the managed default content
// settings values.
@@ -168,9 +168,9 @@ void PolicyDefaultProvider::UpdateManagedDefaultSetting(
// If a pref to manage a default-content-setting was not set (NOTICE:
// "HasPrefPath" returns false if no value was set for a registered pref) then
// the default value of the preference is used. The default value of a
- // preference to manage a default-content-settings is
- // CONTENT_SETTING_DEFAULT. This indicates that no managed value is set. If a
- // pref was set, than it MUST be managed.
+ // preference to manage a default-content-settings is CONTENT_SETTING_DEFAULT.
+ // This indicates that no managed value is set. If a pref was set, than it
+ // MUST be managed.
PrefService* prefs = profile_->GetPrefs();
DCHECK(!prefs->HasPrefPath(kPrefToManageType[type]) ||
prefs->IsManagedPreference(kPrefToManageType[type]));

Powered by Google App Engine
This is Rietveld 408576698