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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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( | 117 registry->RegisterBooleanPref( |
118 prefs::kSafeBrowsingIncidentReportSent, | 118 prefs::kSafeBrowsingIncidentReportSent, |
119 false, | 119 false, |
120 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 120 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 121 registry->RegisterDictionaryPref( |
| 122 prefs::kSafeBrowsingIncidentsSent, |
| 123 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
121 #if defined(ENABLE_GOOGLE_NOW) | 124 #if defined(ENABLE_GOOGLE_NOW) |
122 registry->RegisterBooleanPref( | 125 registry->RegisterBooleanPref( |
123 prefs::kGoogleGeolocationAccessEnabled, | 126 prefs::kGoogleGeolocationAccessEnabled, |
124 false, | 127 false, |
125 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 128 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
126 #endif | 129 #endif |
127 registry->RegisterBooleanPref( | 130 registry->RegisterBooleanPref( |
128 prefs::kDisableExtensions, | 131 prefs::kDisableExtensions, |
129 false, | 132 false, |
130 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 133 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 content::NotificationService::NoDetails()); | 250 content::NotificationService::NoDetails()); |
248 } | 251 } |
249 } | 252 } |
250 | 253 |
251 bool ProfileCompare::operator()(Profile* a, Profile* b) const { | 254 bool ProfileCompare::operator()(Profile* a, Profile* b) const { |
252 DCHECK(a && b); | 255 DCHECK(a && b); |
253 if (a->IsSameProfile(b)) | 256 if (a->IsSameProfile(b)) |
254 return false; | 257 return false; |
255 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 258 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
256 } | 259 } |
OLD | NEW |