| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 158                                 PrefService::UNSYNCABLE_PREF); | 158                                 PrefService::UNSYNCABLE_PREF); | 
| 159   prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors, | 159   prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors, | 
| 160                                 PrefService::UNSYNCABLE_PREF); | 160                                 PrefService::UNSYNCABLE_PREF); | 
| 161   prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints, | 161   prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints, | 
| 162                                 PrefService::UNSYNCABLE_PREF); | 162                                 PrefService::UNSYNCABLE_PREF); | 
| 163   prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, | 163   prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, | 
| 164                                 PrefService::UNSYNCABLE_PREF); | 164                                 PrefService::UNSYNCABLE_PREF); | 
| 165   prefs->RegisterBooleanPref(prefs::kDisableExtensions, | 165   prefs->RegisterBooleanPref(prefs::kDisableExtensions, | 
| 166                              false, | 166                              false, | 
| 167                              PrefService::UNSYNCABLE_PREF); | 167                              PrefService::UNSYNCABLE_PREF); | 
|  | 168   prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref, | 
|  | 169                              false, PrefService::UNSYNCABLE_PREF); | 
| 168   prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, | 170   prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, | 
| 169                             "", | 171                             "", | 
| 170                             PrefService::UNSYNCABLE_PREF); | 172                             PrefService::UNSYNCABLE_PREF); | 
| 171   prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, | 173   prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, | 
| 172                             0.0, | 174                             0.0, | 
| 173                             PrefService::UNSYNCABLE_PREF); | 175                             PrefService::UNSYNCABLE_PREF); | 
| 174   prefs->RegisterDictionaryPref(prefs::kPerHostZoomLevels, | 176   prefs->RegisterDictionaryPref(prefs::kPerHostZoomLevels, | 
| 175                                 PrefService::UNSYNCABLE_PREF); | 177                                 PrefService::UNSYNCABLE_PREF); | 
| 176 #if defined(OS_CHROMEOS) | 178 #if defined(OS_CHROMEOS) | 
| 177   // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 179   // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 212   return is_guest_session; | 214   return is_guest_session; | 
| 213 #else | 215 #else | 
| 214   return false; | 216   return false; | 
| 215 #endif | 217 #endif | 
| 216 } | 218 } | 
| 217 | 219 | 
| 218 bool Profile::IsSyncAccessible() { | 220 bool Profile::IsSyncAccessible() { | 
| 219   ProfileSyncService* syncService = GetProfileSyncService(); | 221   ProfileSyncService* syncService = GetProfileSyncService(); | 
| 220   return syncService && !syncService->IsManaged(); | 222   return syncService && !syncService->IsManaged(); | 
| 221 } | 223 } | 
| OLD | NEW | 
|---|