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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, | 134 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, |
135 true, | 135 true, |
136 PrefService::SYNCABLE_PREF); | 136 PrefService::SYNCABLE_PREF); |
137 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled, | 137 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled, |
138 false, | 138 false, |
139 PrefService::UNSYNCABLE_PREF); | 139 PrefService::UNSYNCABLE_PREF); |
140 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. | 140 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. |
141 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary, | 141 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary, |
142 IDS_SPELLCHECK_DICTIONARY, | 142 IDS_SPELLCHECK_DICTIONARY, |
143 PrefService::UNSYNCABLE_PREF); | 143 PrefService::UNSYNCABLE_PREF); |
| 144 prefs->RegisterBooleanPref(prefs::kSpellCheckUseSpellingService, |
| 145 #if defined(GOOGLE_CHROME_BUILD) |
| 146 true, |
| 147 #else |
| 148 false, |
| 149 #endif |
| 150 PrefService::UNSYNCABLE_PREF); |
144 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, | 151 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, |
145 true, | 152 true, |
146 PrefService::SYNCABLE_PREF); | 153 PrefService::SYNCABLE_PREF); |
147 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, | 154 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, |
148 true, | 155 true, |
149 PrefService::UNSYNCABLE_PREF); | 156 PrefService::UNSYNCABLE_PREF); |
150 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults, | 157 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults, |
151 true, | 158 true, |
152 PrefService::UNSYNCABLE_PREF); | 159 PrefService::UNSYNCABLE_PREF); |
153 #if defined(TOOLKIT_USES_GTK) | 160 #if defined(TOOLKIT_USES_GTK) |
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
870 }; | 877 }; |
871 #endif | 878 #endif |
872 | 879 |
873 Profile* Profile::CreateOffTheRecordProfile() { | 880 Profile* Profile::CreateOffTheRecordProfile() { |
874 #if defined(OS_CHROMEOS) | 881 #if defined(OS_CHROMEOS) |
875 if (Profile::IsGuestSession()) | 882 if (Profile::IsGuestSession()) |
876 return new GuestSessionProfile(this); | 883 return new GuestSessionProfile(this); |
877 #endif | 884 #endif |
878 return new OffTheRecordProfileImpl(this); | 885 return new OffTheRecordProfileImpl(this); |
879 } | 886 } |
OLD | NEW |