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/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
120 false, | 120 false, |
121 PrefService::UNSYNCABLE_PREF); | 121 PrefService::UNSYNCABLE_PREF); |
122 #if defined(TOOLKIT_USES_GTK) | 122 #if defined(TOOLKIT_USES_GTK) |
123 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, | 123 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, |
124 ThemeServiceGtk::DefaultUsesSystemTheme(), | 124 ThemeServiceGtk::DefaultUsesSystemTheme(), |
125 PrefService::UNSYNCABLE_PREF); | 125 PrefService::UNSYNCABLE_PREF); |
126 #endif | 126 #endif |
127 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, | 127 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, |
128 FilePath(), | 128 FilePath(), |
129 PrefService::UNSYNCABLE_PREF); | 129 PrefService::UNSYNCABLE_PREF); |
130 #if !defined(OS_ANDROID) | |
131 // Themes are not supported in android. | |
Elliot Glaysher
2012/03/02 00:23:05
This block is going away and is being moved to the
Ted C
2012/03/08 19:42:08
Hazaa...yay for making my patch smaller. This fil
| |
130 prefs->RegisterStringPref(prefs::kCurrentThemeID, | 132 prefs->RegisterStringPref(prefs::kCurrentThemeID, |
131 ThemeService::kDefaultThemeID, | 133 ThemeService::kDefaultThemeID, |
132 PrefService::UNSYNCABLE_PREF); | 134 PrefService::UNSYNCABLE_PREF); |
133 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages, | 135 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages, |
134 PrefService::UNSYNCABLE_PREF); | 136 PrefService::UNSYNCABLE_PREF); |
135 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors, | 137 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors, |
136 PrefService::UNSYNCABLE_PREF); | 138 PrefService::UNSYNCABLE_PREF); |
137 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints, | 139 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints, |
138 PrefService::UNSYNCABLE_PREF); | 140 PrefService::UNSYNCABLE_PREF); |
139 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, | 141 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, |
140 PrefService::UNSYNCABLE_PREF); | 142 PrefService::UNSYNCABLE_PREF); |
143 #endif | |
141 prefs->RegisterBooleanPref(prefs::kDisableExtensions, | 144 prefs->RegisterBooleanPref(prefs::kDisableExtensions, |
142 false, | 145 false, |
143 PrefService::UNSYNCABLE_PREF); | 146 PrefService::UNSYNCABLE_PREF); |
144 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref, | 147 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref, |
145 false, PrefService::UNSYNCABLE_PREF); | 148 false, PrefService::UNSYNCABLE_PREF); |
146 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, | 149 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, |
147 "", | 150 "", |
148 PrefService::UNSYNCABLE_PREF); | 151 PrefService::UNSYNCABLE_PREF); |
149 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, | 152 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, |
150 0.0, | 153 0.0, |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
193 return is_guest_session; | 196 return is_guest_session; |
194 #else | 197 #else |
195 return false; | 198 return false; |
196 #endif | 199 #endif |
197 } | 200 } |
198 | 201 |
199 bool Profile::IsSyncAccessible() { | 202 bool Profile::IsSyncAccessible() { |
200 browser_sync::SyncPrefs prefs(GetPrefs()); | 203 browser_sync::SyncPrefs prefs(GetPrefs()); |
201 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged(); | 204 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged(); |
202 } | 205 } |
OLD | NEW |