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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 #endif | 195 #endif |
196 #if defined(SPDY_PROXY_AUTH_ORIGIN) | 196 #if defined(SPDY_PROXY_AUTH_ORIGIN) |
197 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); | 197 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); |
198 #endif // defined(SPDY_PROXY_AUTH_ORIGIN) | 198 #endif // defined(SPDY_PROXY_AUTH_ORIGIN) |
199 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) | 199 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) |
200 // Preferences related to the avatar bubble and user manager tutorials. | 200 // Preferences related to the avatar bubble and user manager tutorials. |
201 registry->RegisterIntegerPref( | 201 registry->RegisterIntegerPref( |
202 prefs::kProfileAvatarTutorialShown, | 202 prefs::kProfileAvatarTutorialShown, |
203 0, | 203 0, |
204 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 204 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
205 registry->RegisterBooleanPref( | |
206 prefs::kProfileUserManagerTutorialShown, | |
207 false, | |
208 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
209 #endif | 205 #endif |
210 } | 206 } |
211 | 207 |
212 std::string Profile::GetDebugName() { | 208 std::string Profile::GetDebugName() { |
213 std::string name = GetPath().BaseName().MaybeAsASCII(); | 209 std::string name = GetPath().BaseName().MaybeAsASCII(); |
214 if (name.empty()) { | 210 if (name.empty()) { |
215 name = "UnknownProfile"; | 211 name = "UnknownProfile"; |
216 } | 212 } |
217 return name; | 213 return name; |
218 } | 214 } |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 content::NotificationService::NoDetails()); | 251 content::NotificationService::NoDetails()); |
256 } | 252 } |
257 } | 253 } |
258 | 254 |
259 bool ProfileCompare::operator()(Profile* a, Profile* b) const { | 255 bool ProfileCompare::operator()(Profile* a, Profile* b) const { |
260 DCHECK(a && b); | 256 DCHECK(a && b); |
261 if (a->IsSameProfile(b)) | 257 if (a->IsSameProfile(b)) |
262 return false; | 258 return false; |
263 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 259 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
264 } | 260 } |
OLD | NEW |