OLD | NEW |
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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 | 319 |
320 // static | 320 // static |
321 const char ProfileImpl::kPrefExitTypeNormal[] = "Normal"; | 321 const char ProfileImpl::kPrefExitTypeNormal[] = "Normal"; |
322 | 322 |
323 // static | 323 // static |
324 void ProfileImpl::RegisterProfilePrefs( | 324 void ProfileImpl::RegisterProfilePrefs( |
325 user_prefs::PrefRegistrySyncable* registry) { | 325 user_prefs::PrefRegistrySyncable* registry) { |
326 registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false); | 326 registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false); |
327 registry->RegisterBooleanPref(prefs::kAllowDeletingBrowserHistory, true); | 327 registry->RegisterBooleanPref(prefs::kAllowDeletingBrowserHistory, true); |
328 registry->RegisterBooleanPref(prefs::kForceGoogleSafeSearch, false); | 328 registry->RegisterBooleanPref(prefs::kForceGoogleSafeSearch, false); |
329 registry->RegisterIntegerPref(prefs::kForceYouTubeRestrict, | 329 registry->RegisterBooleanPref(prefs::kForceYouTubeSafetyMode, false); |
330 safe_search_util::YOUTUBE_RESTRICT_OFF); | |
331 registry->RegisterBooleanPref(prefs::kForceSessionSync, false); | 330 registry->RegisterBooleanPref(prefs::kForceSessionSync, false); |
332 registry->RegisterStringPref(prefs::kAllowedDomainsForApps, std::string()); | 331 registry->RegisterStringPref(prefs::kAllowedDomainsForApps, std::string()); |
333 | 332 |
334 #if defined(OS_ANDROID) | 333 #if defined(OS_ANDROID) |
335 // The following prefs don't need to be sync'd to mobile. This file isn't | 334 // The following prefs don't need to be sync'd to mobile. This file isn't |
336 // compiled on iOS so we only need to exclude them syncing from the Android | 335 // compiled on iOS so we only need to exclude them syncing from the Android |
337 // build. | 336 // build. |
338 registry->RegisterIntegerPref(prefs::kProfileAvatarIndex, -1); | 337 registry->RegisterIntegerPref(prefs::kProfileAvatarIndex, -1); |
339 // Whether a profile is using an avatar without having explicitely chosen it | 338 // Whether a profile is using an avatar without having explicitely chosen it |
340 // (i.e. was assigned by default by legacy profile creation). | 339 // (i.e. was assigned by default by legacy profile creation). |
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1272 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1271 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
1273 domain_reliability::DomainReliabilityService* service = | 1272 domain_reliability::DomainReliabilityService* service = |
1274 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1273 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1275 GetForBrowserContext(this); | 1274 GetForBrowserContext(this); |
1276 if (!service) | 1275 if (!service) |
1277 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1276 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1278 | 1277 |
1279 return service->CreateMonitor( | 1278 return service->CreateMonitor( |
1280 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 1279 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
1281 } | 1280 } |
OLD | NEW |