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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.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: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index e998fafac2cd26ca34d3e5f928523738829ceac1..d78b31432e00fb3b4e8c2ce05a27b805b8a54dab 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -80,6 +80,12 @@
#include "extensions/common/extension.h"
#endif
+#if defined(ENABLE_SUPERVISED_USERS)
+#include "chrome/browser/content_settings/content_settings_supervised_provider.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
+#endif
+
using content::BrowserThread;
using content::DownloadManagerDelegate;
using content::HostZoomMap;
@@ -392,6 +398,15 @@ HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {
host_content_settings_map_.get());
}
#endif
+#if defined(ENABLE_SUPERVISED_USERS)
+ SupervisedUserSettingsService* supervised_service =
+ SupervisedUserSettingsServiceFactory::GetForProfile(this);
+ scoped_ptr<content_settings::SupervisedProvider> supervised_provider(
+ new content_settings::SupervisedProvider(supervised_service));
+ host_content_settings_map_->RegisterProvider(
+ HostContentSettingsMap::SUPERVISED_PROVIDER,
+ supervised_provider.Pass());
+#endif
}
return host_content_settings_map_.get();
}
« no previous file with comments | « chrome/browser/content_settings/content_settings_supervised_provider.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698