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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 PrefRegistry::LOSSY_PREF); | 93 PrefRegistry::LOSSY_PREF); |
94 registry->RegisterBooleanPref( | 94 registry->RegisterBooleanPref( |
95 prefs::kSafeBrowsingEnabled, | 95 prefs::kSafeBrowsingEnabled, |
96 true, | 96 true, |
97 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 97 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
98 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, | 98 registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled, |
99 false); | 99 false); |
100 registry->RegisterBooleanPref(prefs::kSafeBrowsingScoutReportingEnabled, | 100 registry->RegisterBooleanPref(prefs::kSafeBrowsingScoutReportingEnabled, |
101 false); | 101 false); |
102 registry->RegisterBooleanPref(prefs::kSafeBrowsingScoutGroupSelected, false); | 102 registry->RegisterBooleanPref(prefs::kSafeBrowsingScoutGroupSelected, false); |
| 103 registry->RegisterBooleanPref(prefs::kSafeBrowsingSawInterstitialSber1, |
| 104 false); |
| 105 registry->RegisterBooleanPref(prefs::kSafeBrowsingSawInterstitialSber2, |
| 106 false); |
103 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, | 107 registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, |
104 false); | 108 false); |
105 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); | 109 registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); |
106 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); | 110 registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent); |
107 registry->RegisterBooleanPref( | 111 registry->RegisterBooleanPref( |
108 prefs::kSafeBrowsingExtendedReportingOptInAllowed, true); | 112 prefs::kSafeBrowsingExtendedReportingOptInAllowed, true); |
109 // This pref is intentionally outside the above #if. That flag corresponds | 113 // This pref is intentionally outside the above #if. That flag corresponds |
110 // to the Notifier extension and does not gate the launcher page. | 114 // to the Notifier extension and does not gate the launcher page. |
111 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827. | 115 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827. |
112 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true); | 116 registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true); |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 if (a->IsSameProfile(b)) | 246 if (a->IsSameProfile(b)) |
243 return false; | 247 return false; |
244 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 248 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
245 } | 249 } |
246 | 250 |
247 double Profile::GetDefaultZoomLevelForProfile() { | 251 double Profile::GetDefaultZoomLevelForProfile() { |
248 return GetDefaultStoragePartition(this) | 252 return GetDefaultStoragePartition(this) |
249 ->GetHostZoomMap() | 253 ->GetHostZoomMap() |
250 ->GetDefaultZoomLevel(); | 254 ->GetDefaultZoomLevel(); |
251 } | 255 } |
OLD | NEW |