Chromium Code Reviews| 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 "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 true, | 91 true, |
| 92 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 92 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 93 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, | 93 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, |
| 94 false); | 94 false); |
| 95 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, | 95 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, |
| 96 false); | 96 false); |
| 97 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); | 97 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); |
| 98 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); | 98 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); |
| 99 registry->RegisterBooleanPref( | 99 registry->RegisterBooleanPref( |
| 100 prefs::kSafeBrowsingExtendedReportingOptInAllowed, true); | 100 prefs::kSafeBrowsingExtendedReportingOptInAllowed, true); |
| 101 #if defined(ENABLE_GOOGLE_NOW) | 101 #if BUILDFLAG(ENABLE_GOOGLE_NOW) |
|
Mark Mentovai
2015/11/19 21:52:56
Include what you use.
| |
| 102 registry->RegisterBooleanPref(prefs::kGoogleGeolocationAccessEnabled, false); | 102 registry->RegisterBooleanPref(prefs::kGoogleGeolocationAccessEnabled, false); |
| 103 #endif | 103 #endif |
| 104 // This pref is intentionally outside the above #if. That flag corresponds | 104 // This pref is intentionally outside the above #if. That flag corresponds |
| 105 // to the Notifier extension and does not gate the launcher page. | 105 // to the Notifier extension and does not gate the launcher page. |
| 106 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827. | 106 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827. |
| 107 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true); | 107 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true); |
| 108 registry->RegisterBooleanPref(prefs::kDisableExtensions, false); | 108 registry->RegisterBooleanPref(prefs::kDisableExtensions, false); |
| 109 #if defined(ENABLE_EXTENSIONS) | 109 #if defined(ENABLE_EXTENSIONS) |
| 110 registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized, | 110 registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized, |
| 111 false); | 111 false); |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 206 if (a->IsSameProfile(b)) | 206 if (a->IsSameProfile(b)) |
| 207 return false; | 207 return false; |
| 208 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 208 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 209 } | 209 } |
| 210 | 210 |
| 211 double Profile::GetDefaultZoomLevelForProfile() { | 211 double Profile::GetDefaultZoomLevelForProfile() { |
| 212 return GetDefaultStoragePartition(this) | 212 return GetDefaultStoragePartition(this) |
| 213 ->GetHostZoomMap() | 213 ->GetHostZoomMap() |
| 214 ->GetDefaultZoomLevel(); | 214 ->GetDefaultZoomLevel(); |
| 215 } | 215 } |
| OLD | NEW |