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 <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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 true, | 347 true, |
348 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 348 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
349 registry->RegisterBooleanPref( | 349 registry->RegisterBooleanPref( |
350 prefs::kSigninAllowed, | 350 prefs::kSigninAllowed, |
351 true, | 351 true, |
352 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 352 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
353 registry->RegisterBooleanPref( | 353 registry->RegisterBooleanPref( |
354 prefs::kForceSafeSearch, | 354 prefs::kForceSafeSearch, |
355 false, | 355 false, |
356 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 356 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 357 registry->RegisterBooleanPref( |
| 358 prefs::kRecordHistory, |
| 359 false, |
| 360 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
357 registry->RegisterIntegerPref( | 361 registry->RegisterIntegerPref( |
358 prefs::kProfileAvatarIndex, | 362 prefs::kProfileAvatarIndex, |
359 -1, | 363 -1, |
360 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 364 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
361 registry->RegisterStringPref( | 365 registry->RegisterStringPref( |
362 prefs::kSupervisedUserId, | 366 prefs::kSupervisedUserId, |
363 std::string(), | 367 std::string(), |
364 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 368 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
365 registry->RegisterStringPref(prefs::kProfileName, | 369 registry->RegisterStringPref(prefs::kProfileName, |
366 std::string(), | 370 std::string(), |
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1401 ProfileImpl::CreateDomainReliabilityMonitor() { | 1405 ProfileImpl::CreateDomainReliabilityMonitor() { |
1402 domain_reliability::DomainReliabilityService* service = | 1406 domain_reliability::DomainReliabilityService* service = |
1403 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1407 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1404 GetForBrowserContext(this); | 1408 GetForBrowserContext(this); |
1405 if (!service) | 1409 if (!service) |
1406 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1410 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1407 | 1411 |
1408 return service->CreateMonitor( | 1412 return service->CreateMonitor( |
1409 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1413 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1410 } | 1414 } |
OLD | NEW |