| 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 true, | 92 true, |
| 93 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 93 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 94 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, | 94 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, |
| 95 false); | 95 false); |
| 96 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, | 96 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, |
| 97 false); | 97 false); |
| 98 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); | 98 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); |
| 99 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); | 99 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); |
| 100 registry->RegisterBooleanPref( | 100 registry->RegisterBooleanPref( |
| 101 prefs::kSafeBrowsingExtendedReportingOptInAllowed, true); | 101 prefs::kSafeBrowsingExtendedReportingOptInAllowed, true); |
| 102 #if BUILDFLAG(ENABLE_GOOGLE_NOW) | |
| 103 registry->RegisterBooleanPref(prefs::kGoogleGeolocationAccessEnabled, false); | |
| 104 #endif | |
| 105 // This pref is intentionally outside the above #if. That flag corresponds | 102 // This pref is intentionally outside the above #if. That flag corresponds |
| 106 // to the Notifier extension and does not gate the launcher page. | 103 // to the Notifier extension and does not gate the launcher page. |
| 107 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827. | 104 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827. |
| 108 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true); | 105 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true); |
| 109 registry->RegisterBooleanPref(prefs::kDisableExtensions, false); | 106 registry->RegisterBooleanPref(prefs::kDisableExtensions, false); |
| 110 #if defined(ENABLE_EXTENSIONS) | 107 #if defined(ENABLE_EXTENSIONS) |
| 111 registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized, | 108 registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized, |
| 112 false); | 109 false); |
| 113 #endif | 110 #endif |
| 114 registry->RegisterStringPref(prefs::kSelectFileLastDirectory, std::string()); | 111 registry->RegisterStringPref(prefs::kSelectFileLastDirectory, std::string()); |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 if (a->IsSameProfile(b)) | 226 if (a->IsSameProfile(b)) |
| 230 return false; | 227 return false; |
| 231 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 228 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 232 } | 229 } |
| 233 | 230 |
| 234 double Profile::GetDefaultZoomLevelForProfile() { | 231 double Profile::GetDefaultZoomLevelForProfile() { |
| 235 return GetDefaultStoragePartition(this) | 232 return GetDefaultStoragePartition(this) |
| 236 ->GetHostZoomMap() | 233 ->GetHostZoomMap() |
| 237 ->GetDefaultZoomLevel(); | 234 ->GetDefaultZoomLevel(); |
| 238 } | 235 } |
| OLD | NEW |