| 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.h" | 5 #include "chrome/browser/profiles/profile.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 true, | 80 true, |
| 81 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 81 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 82 #if BUILDFLAG(ANDROID_JAVA_UI) | 82 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 83 registry->RegisterStringPref( | 83 registry->RegisterStringPref( |
| 84 prefs::kContextualSearchEnabled, | 84 prefs::kContextualSearchEnabled, |
| 85 std::string(), | 85 std::string(), |
| 86 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 86 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 87 #endif | 87 #endif |
| 88 registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true); | 88 registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true); |
| 89 registry->RegisterStringPref(prefs::kSessionExitType, std::string()); | 89 registry->RegisterStringPref(prefs::kSessionExitType, std::string()); |
| 90 registry->RegisterInt64Pref(prefs::kSiteEngagementLastUpdateTime, 0, |
| 91 PrefRegistry::LOSSY_PREF); |
| 90 registry->RegisterBooleanPref( | 92 registry->RegisterBooleanPref( |
| 91 prefs::kSafeBrowsingEnabled, | 93 prefs::kSafeBrowsingEnabled, |
| 92 true, | 94 true, |
| 93 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 95 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 94 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, | 96 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, |
| 95 false); | 97 false); |
| 96 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, | 98 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, |
| 97 false); | 99 false); |
| 98 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); | 100 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); |
| 99 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); | 101 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 if (a->IsSameProfile(b)) | 234 if (a->IsSameProfile(b)) |
| 233 return false; | 235 return false; |
| 234 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 236 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 235 } | 237 } |
| 236 | 238 |
| 237 double Profile::GetDefaultZoomLevelForProfile() { | 239 double Profile::GetDefaultZoomLevelForProfile() { |
| 238 return GetDefaultStoragePartition(this) | 240 return GetDefaultStoragePartition(this) |
| 239 ->GetHostZoomMap() | 241 ->GetHostZoomMap() |
| 240 ->GetDefaultZoomLevel(); | 242 ->GetDefaultZoomLevel(); |
| 241 } | 243 } |
| OLD | NEW |