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..b288d8f1726e02b17907ed6c8b3435c23bb7524b 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,18 @@ 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()); |
Bernhard Bauer
2015/02/26 18:03:54
The supervised_provider can subscribe itself to th
knn
2015/02/27 10:43:53
Done.
|
+ supervised_service->Subscribe(base::Bind( |
+ &content_settings::SupervisedProvider::OnSupervisedSettingsAvailable, |
+ base::Unretained(supervised_provider.get()))); |
+ host_content_settings_map_->RegisterProvider( |
+ HostContentSettingsMap::SUPERVISED_PROVIDER, |
+ supervised_provider.Pass()); |
+#endif |
} |
return host_content_settings_map_.get(); |
} |