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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 false, | 107 false, |
108 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 108 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
109 registry->RegisterBooleanPref( | 109 registry->RegisterBooleanPref( |
110 prefs::kSafeBrowsingReportingEnabled, | 110 prefs::kSafeBrowsingReportingEnabled, |
111 false, | 111 false, |
112 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 112 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
113 registry->RegisterBooleanPref( | 113 registry->RegisterBooleanPref( |
114 prefs::kSafeBrowsingProceedAnywayDisabled, | 114 prefs::kSafeBrowsingProceedAnywayDisabled, |
115 false, | 115 false, |
116 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 116 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 117 registry->RegisterBooleanPref( |
| 118 prefs::kSafeBrowsingIncidentReportSent, |
| 119 false, |
| 120 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
117 #if defined(ENABLE_GOOGLE_NOW) | 121 #if defined(ENABLE_GOOGLE_NOW) |
118 registry->RegisterBooleanPref( | 122 registry->RegisterBooleanPref( |
119 prefs::kGoogleGeolocationAccessEnabled, | 123 prefs::kGoogleGeolocationAccessEnabled, |
120 false, | 124 false, |
121 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 125 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
122 #endif | 126 #endif |
123 registry->RegisterBooleanPref( | 127 registry->RegisterBooleanPref( |
124 prefs::kDisableExtensions, | 128 prefs::kDisableExtensions, |
125 false, | 129 false, |
126 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 130 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 content::NotificationService::NoDetails()); | 247 content::NotificationService::NoDetails()); |
244 } | 248 } |
245 } | 249 } |
246 | 250 |
247 bool ProfileCompare::operator()(Profile* a, Profile* b) const { | 251 bool ProfileCompare::operator()(Profile* a, Profile* b) const { |
248 DCHECK(a && b); | 252 DCHECK(a && b); |
249 if (a->IsSameProfile(b)) | 253 if (a->IsSameProfile(b)) |
250 return false; | 254 return false; |
251 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 255 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
252 } | 256 } |
OLD | NEW |