Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref, | 172 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref, |
| 173 false, PrefService::UNSYNCABLE_PREF); | 173 false, PrefService::UNSYNCABLE_PREF); |
| 174 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, | 174 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, |
| 175 "", | 175 "", |
| 176 PrefService::UNSYNCABLE_PREF); | 176 PrefService::UNSYNCABLE_PREF); |
| 177 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, | 177 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, |
| 178 0.0, | 178 0.0, |
| 179 PrefService::UNSYNCABLE_PREF); | 179 PrefService::UNSYNCABLE_PREF); |
| 180 prefs->RegisterDictionaryPref(prefs::kPerHostZoomLevels, | 180 prefs->RegisterDictionaryPref(prefs::kPerHostZoomLevels, |
| 181 PrefService::UNSYNCABLE_PREF); | 181 PrefService::UNSYNCABLE_PREF); |
| 182 prefs->RegisterIntegerPref(prefs::kDefaultAppsInstallState, 0, | |
|
Mihai Parparita -not on Chrome
2011/10/19 07:31:36
Pref registration should also be done in DefaultAp
Roger Tawa OOO till Jul 10th
2011/10/19 20:48:25
Done.
| |
| 183 PrefService::UNSYNCABLE_PREF); | |
| 182 prefs->RegisterStringPref(prefs::kDefaultApps, | 184 prefs->RegisterStringPref(prefs::kDefaultApps, |
| 183 "install", | 185 "install", |
| 184 PrefService::UNSYNCABLE_PREF); | 186 PrefService::UNSYNCABLE_PREF); |
| 185 #if defined(OS_CHROMEOS) | 187 #if defined(OS_CHROMEOS) |
| 186 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 188 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both |
| 187 // local state and user's profile. For other platforms we maintain | 189 // local state and user's profile. For other platforms we maintain |
| 188 // kApplicationLocale only in local state. | 190 // kApplicationLocale only in local state. |
| 189 // In the future we may want to maintain kApplicationLocale | 191 // In the future we may want to maintain kApplicationLocale |
| 190 // in user's profile for other platforms as well. | 192 // in user's profile for other platforms as well. |
| 191 prefs->RegisterStringPref(prefs::kApplicationLocale, | 193 prefs->RegisterStringPref(prefs::kApplicationLocale, |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 221 return is_guest_session; | 223 return is_guest_session; |
| 222 #else | 224 #else |
| 223 return false; | 225 return false; |
| 224 #endif | 226 #endif |
| 225 } | 227 } |
| 226 | 228 |
| 227 bool Profile::IsSyncAccessible() { | 229 bool Profile::IsSyncAccessible() { |
| 228 ProfileSyncService* syncService = GetProfileSyncService(); | 230 ProfileSyncService* syncService = GetProfileSyncService(); |
| 229 return syncService && !syncService->IsManaged(); | 231 return syncService && !syncService->IsManaged(); |
| 230 } | 232 } |
| OLD | NEW |