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

Side by Side Diff: chrome/browser/profiles/profile_impl.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 unified diff | Download patch
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 315 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
316 registry->RegisterBooleanPref( 316 registry->RegisterBooleanPref(
317 prefs::kAllowDeletingBrowserHistory, 317 prefs::kAllowDeletingBrowserHistory,
318 true, 318 true,
319 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 319 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
320 registry->RegisterBooleanPref( 320 registry->RegisterBooleanPref(
321 prefs::kSigninAllowed, 321 prefs::kSigninAllowed,
322 true, 322 true,
323 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 323 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
324 registry->RegisterBooleanPref( 324 registry->RegisterBooleanPref(
325 prefs::kForceSafeSearch,
326 false,
327 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
328 registry->RegisterBooleanPref(
329 prefs::kForceGoogleSafeSearch, 325 prefs::kForceGoogleSafeSearch,
330 false, 326 false,
331 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 327 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
332 registry->RegisterBooleanPref( 328 registry->RegisterBooleanPref(
333 prefs::kForceYouTubeSafetyMode, 329 prefs::kForceYouTubeSafetyMode,
334 false, 330 false,
335 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 331 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
336 registry->RegisterBooleanPref( 332 registry->RegisterBooleanPref(
337 prefs::kRecordHistory, 333 prefs::kRecordHistory,
338 false, 334 false,
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1335 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1340 domain_reliability::DomainReliabilityService* service = 1336 domain_reliability::DomainReliabilityService* service =
1341 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1337 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1342 GetForBrowserContext(this); 1338 GetForBrowserContext(this);
1343 if (!service) 1339 if (!service)
1344 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1340 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1345 1341
1346 return service->CreateMonitor( 1342 return service->CreateMonitor(
1347 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1343 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1348 } 1344 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698