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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 std::string(), | 178 std::string(), |
179 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 179 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
180 #endif | 180 #endif |
181 | 181 |
182 #if defined(OS_ANDROID) | 182 #if defined(OS_ANDROID) |
183 registry->RegisterBooleanPref( | 183 registry->RegisterBooleanPref( |
184 prefs::kDevToolsRemoteEnabled, | 184 prefs::kDevToolsRemoteEnabled, |
185 false, | 185 false, |
186 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 186 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
187 #endif | 187 #endif |
188 #if defined(SPDY_PROXY_AUTH_ORIGIN) | 188 |
189 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); | 189 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); |
190 #endif // defined(SPDY_PROXY_AUTH_ORIGIN) | 190 |
191 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) | 191 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) |
192 // Preferences related to the avatar bubble and user manager tutorials. | 192 // Preferences related to the avatar bubble and user manager tutorials. |
193 registry->RegisterIntegerPref( | 193 registry->RegisterIntegerPref( |
194 prefs::kProfileAvatarTutorialShown, | 194 prefs::kProfileAvatarTutorialShown, |
195 0, | 195 0, |
196 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 196 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
197 #endif | 197 #endif |
198 } | 198 } |
199 | 199 |
200 std::string Profile::GetDebugName() { | 200 std::string Profile::GetDebugName() { |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 content::NotificationService::NoDetails()); | 243 content::NotificationService::NoDetails()); |
244 } | 244 } |
245 } | 245 } |
246 | 246 |
247 bool ProfileCompare::operator()(Profile* a, Profile* b) const { | 247 bool ProfileCompare::operator()(Profile* a, Profile* b) const { |
248 DCHECK(a && b); | 248 DCHECK(a && b); |
249 if (a->IsSameProfile(b)) | 249 if (a->IsSameProfile(b)) |
250 return false; | 250 return false; |
251 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 251 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
252 } | 252 } |
OLD | NEW |