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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
313 true, | 313 true, |
314 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 314 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
315 registry->RegisterBooleanPref( | 315 registry->RegisterBooleanPref( |
316 prefs::kSigninAllowed, | 316 prefs::kSigninAllowed, |
317 true, | 317 true, |
318 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 318 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
319 registry->RegisterBooleanPref( | 319 registry->RegisterBooleanPref( |
320 prefs::kForceSafeSearch, | 320 prefs::kForceSafeSearch, |
321 false, | 321 false, |
322 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 322 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 323 registry->RegisterBooleanPref( |
| 324 prefs::kRecordHistory, |
| 325 false, |
| 326 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
323 registry->RegisterIntegerPref( | 327 registry->RegisterIntegerPref( |
324 prefs::kProfileAvatarIndex, | 328 prefs::kProfileAvatarIndex, |
325 -1, | 329 -1, |
326 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 330 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
327 // Whether a profile is using an avatar without having explicitely chosen it | 331 // Whether a profile is using an avatar without having explicitely chosen it |
328 // (i.e. was assigned by default by legacy profile creation). | 332 // (i.e. was assigned by default by legacy profile creation). |
329 registry->RegisterBooleanPref( | 333 registry->RegisterBooleanPref( |
330 prefs::kProfileUsingDefaultAvatar, | 334 prefs::kProfileUsingDefaultAvatar, |
331 true, | 335 true, |
332 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 336 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1431 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1435 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1432 GetForBrowserContext(this); | 1436 GetForBrowserContext(this); |
1433 if (!service) | 1437 if (!service) |
1434 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1438 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1435 | 1439 |
1436 return service->CreateMonitor( | 1440 return service->CreateMonitor( |
1437 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), | 1441 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
1438 local_state, | 1442 local_state, |
1439 prefs::kMetricsReportingEnabled); | 1443 prefs::kMetricsReportingEnabled); |
1440 } | 1444 } |
OLD | NEW |