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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. | 121 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. |
122 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary, | 122 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary, |
123 IDS_SPELLCHECK_DICTIONARY, | 123 IDS_SPELLCHECK_DICTIONARY, |
124 PrefService::UNSYNCABLE_PREF); | 124 PrefService::UNSYNCABLE_PREF); |
125 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, | 125 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, |
126 true, | 126 true, |
127 PrefService::SYNCABLE_PREF); | 127 PrefService::SYNCABLE_PREF); |
128 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, | 128 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, |
129 true, | 129 true, |
130 PrefService::UNSYNCABLE_PREF); | 130 PrefService::UNSYNCABLE_PREF); |
| 131 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults, |
| 132 true, |
| 133 PrefService::UNSYNCABLE_PREF); |
131 #if defined(TOOLKIT_USES_GTK) | 134 #if defined(TOOLKIT_USES_GTK) |
132 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, | 135 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, |
133 GtkThemeService::DefaultUsesSystemTheme(), | 136 GtkThemeService::DefaultUsesSystemTheme(), |
134 PrefService::UNSYNCABLE_PREF); | 137 PrefService::UNSYNCABLE_PREF); |
135 #endif | 138 #endif |
136 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, | 139 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, |
137 FilePath(), | 140 FilePath(), |
138 PrefService::UNSYNCABLE_PREF); | 141 PrefService::UNSYNCABLE_PREF); |
139 prefs->RegisterStringPref(prefs::kCurrentThemeID, | 142 prefs->RegisterStringPref(prefs::kCurrentThemeID, |
140 ThemeService::kDefaultThemeID, | 143 ThemeService::kDefaultThemeID, |
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 }; | 847 }; |
845 #endif | 848 #endif |
846 | 849 |
847 Profile* Profile::CreateOffTheRecordProfile() { | 850 Profile* Profile::CreateOffTheRecordProfile() { |
848 #if defined(OS_CHROMEOS) | 851 #if defined(OS_CHROMEOS) |
849 if (Profile::IsGuestSession()) | 852 if (Profile::IsGuestSession()) |
850 return new GuestSessionProfile(this); | 853 return new GuestSessionProfile(this); |
851 #endif | 854 #endif |
852 return new OffTheRecordProfileImpl(this); | 855 return new OffTheRecordProfileImpl(this); |
853 } | 856 } |
OLD | NEW |