| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 // kApplicationLocale only in local state. | 125 // kApplicationLocale only in local state. |
| 126 // In the future we may want to maintain kApplicationLocale | 126 // In the future we may want to maintain kApplicationLocale |
| 127 // in user's profile for other platforms as well. | 127 // in user's profile for other platforms as well. |
| 128 registry->RegisterStringPref( | 128 registry->RegisterStringPref( |
| 129 prefs::kApplicationLocale, | 129 prefs::kApplicationLocale, |
| 130 std::string(), | 130 std::string(), |
| 131 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); | 131 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); |
| 132 registry->RegisterStringPref(prefs::kApplicationLocaleBackup, std::string()); | 132 registry->RegisterStringPref(prefs::kApplicationLocaleBackup, std::string()); |
| 133 registry->RegisterStringPref(prefs::kApplicationLocaleAccepted, | 133 registry->RegisterStringPref(prefs::kApplicationLocaleAccepted, |
| 134 std::string()); | 134 std::string()); |
| 135 registry->RegisterStringPref(prefs::kCurrentWallpaperAppName, std::string()); | 135 registry->RegisterStringPref(prefs::kCurrentWallpaperAppName, std::string(), |
| 136 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 136 #endif | 137 #endif |
| 137 | 138 |
| 138 #if defined(OS_ANDROID) | 139 #if defined(OS_ANDROID) |
| 139 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false); | 140 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false); |
| 140 #endif | 141 #endif |
| 141 | 142 |
| 142 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); | 143 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); |
| 143 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); | 144 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); |
| 144 | 145 |
| 145 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) | 146 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 if (a->IsSameProfile(b)) | 220 if (a->IsSameProfile(b)) |
| 220 return false; | 221 return false; |
| 221 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 222 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 222 } | 223 } |
| 223 | 224 |
| 224 double Profile::GetDefaultZoomLevelForProfile() { | 225 double Profile::GetDefaultZoomLevelForProfile() { |
| 225 return GetDefaultStoragePartition(this) | 226 return GetDefaultStoragePartition(this) |
| 226 ->GetHostZoomMap() | 227 ->GetHostZoomMap() |
| 227 ->GetDefaultZoomLevel(); | 228 ->GetDefaultZoomLevel(); |
| 228 } | 229 } |
| OLD | NEW |