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

Unified Diff: components/content_settings/core/browser/host_content_settings_map.cc

Issue 902833003: Add a HostContentSettingsMap layer for Supervised Users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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: components/content_settings/core/browser/host_content_settings_map.cc
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 386de0c5872b9a8524b3899a19e271ffed60b654..1ae438ea5b9747c6f2aab9f46f033851c8cb82c6 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -20,6 +20,7 @@
#include "components/content_settings/core/browser/content_settings_pref_provider.h"
#include "components/content_settings/core/browser/content_settings_provider.h"
#include "components/content_settings/core/browser/content_settings_rule.h"
+#include "components/content_settings/core/browser/content_settings_supervised_provider.h"
#include "components/content_settings/core/browser/content_settings_utils.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/content_settings/core/common/pref_names.h"
@@ -37,6 +38,7 @@ typedef std::pair<std::string, std::string> StringPair;
// TODO(bauerb): Expose constants.
const char* kProviderNames[] = {
"platform_app",
+ "supervised",
Bernhard Bauer 2015/02/05 12:07:51 "supervised_user" maybe?
knn 2015/02/26 12:07:30 Done.
"policy",
"extension",
"override",
@@ -57,6 +59,7 @@ const char kExtensionScheme[] = "chrome-extension";
content_settings::SettingSource kProviderSourceMap[] = {
content_settings::SETTING_SOURCE_EXTENSION,
content_settings::SETTING_SOURCE_POLICY,
+ content_settings::SETTING_SOURCE_SUPERVISED,
content_settings::SETTING_SOURCE_EXTENSION,
content_settings::SETTING_SOURCE_USER,
content_settings::SETTING_SOURCE_USER,
@@ -87,6 +90,11 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
policy_provider->AddObserver(this);
content_settings_providers_[POLICY_PROVIDER] = policy_provider;
+ content_settings::ObservableProvider* supervised_provider =
+ new content_settings::SupervisedProvider(prefs_);
+ supervised_provider->AddObserver(this);
+ content_settings_providers_[SUPERVISED_PROVIDER] = supervised_provider;
+
content_settings::ObservableProvider* pref_provider =
new content_settings::PrefProvider(prefs_, is_off_the_record_);
pref_provider->AddObserver(this);
@@ -113,6 +121,7 @@ void HostContentSettingsMap::RegisterProfilePrefs(
content_settings::DefaultProvider::RegisterProfilePrefs(registry);
content_settings::PrefProvider::RegisterProfilePrefs(registry);
content_settings::PolicyProvider::RegisterProfilePrefs(registry);
+ content_settings::SupervisedProvider::RegisterProfilePrefs(registry);
content_settings::OverrideProvider::RegisterProfilePrefs(registry);
}

Powered by Google App Engine
This is Rietveld 408576698