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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 | 186 |
187 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); | 187 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); |
188 | 188 |
189 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) | 189 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) |
190 // Preferences related to the avatar bubble and user manager tutorials. | 190 // Preferences related to the avatar bubble and user manager tutorials. |
191 registry->RegisterIntegerPref( | 191 registry->RegisterIntegerPref( |
192 prefs::kProfileAvatarTutorialShown, | 192 prefs::kProfileAvatarTutorialShown, |
193 0, | 193 0, |
194 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 194 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
195 #endif | 195 #endif |
| 196 |
| 197 registry->RegisterStringPref(prefs::kAnimationPolicy, "allowed", |
| 198 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
196 } | 199 } |
197 | 200 |
198 std::string Profile::GetDebugName() { | 201 std::string Profile::GetDebugName() { |
199 std::string name = GetPath().BaseName().MaybeAsASCII(); | 202 std::string name = GetPath().BaseName().MaybeAsASCII(); |
200 if (name.empty()) { | 203 if (name.empty()) { |
201 name = "UnknownProfile"; | 204 name = "UnknownProfile"; |
202 } | 205 } |
203 return name; | 206 return name; |
204 } | 207 } |
205 | 208 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 if (a->IsSameProfile(b)) | 252 if (a->IsSameProfile(b)) |
250 return false; | 253 return false; |
251 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 254 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
252 } | 255 } |
253 | 256 |
254 double Profile::GetDefaultZoomLevelForProfile() { | 257 double Profile::GetDefaultZoomLevelForProfile() { |
255 return GetDefaultStoragePartition(this) | 258 return GetDefaultStoragePartition(this) |
256 ->GetHostZoomMap() | 259 ->GetHostZoomMap() |
257 ->GetDefaultZoomLevel(); | 260 ->GetDefaultZoomLevel(); |
258 } | 261 } |
OLD | NEW |