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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1056003003: Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Android Created 5 years, 8 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/profiles/profile_io_data.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index bfa527c67782944a1d2e8c583b24aeaef8c3eeec..2bd781cba00f19f27d5276fc59821b446cd0a0f7 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -452,7 +452,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
ChromeNetworkDelegate::InitializePrefsOnUIThread(
&enable_referrers_,
&enable_do_not_track_,
- &force_safesearch_,
&force_google_safesearch_,
&force_youtube_safety_mode_,
pref_service);
@@ -1025,7 +1024,6 @@ void ProfileIOData::Init(
network_delegate->set_profile_path(profile_params_->path);
network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
network_delegate->set_enable_do_not_track(&enable_do_not_track_);
- network_delegate->set_force_safe_search(&force_safesearch_);
network_delegate->set_force_google_safe_search(&force_google_safesearch_);
network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_);
fraudulent_certificate_reporter_.reset(
@@ -1210,7 +1208,6 @@ void ProfileIOData::ShutdownOnUIThread(
google_services_user_account_id_.Destroy();
enable_referrers_.Destroy();
enable_do_not_track_.Destroy();
- force_safesearch_.Destroy();
force_google_safesearch_.Destroy();
force_youtube_safety_mode_.Destroy();
#if !defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698