| 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 #if defined(GOOGLE_CHROME_BUILD) |
| 145 prefs->RegisterBooleanPref(prefs::kSpellCheckUseSpellingService, |
| 146 true, |
| 147 PrefService::UNSYNCABLE_PREF); |
| 148 #endif |
| 144 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, | 149 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, |
| 145 true, | 150 true, |
| 146 PrefService::SYNCABLE_PREF); | 151 PrefService::SYNCABLE_PREF); |
| 147 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, | 152 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, |
| 148 true, | 153 true, |
| 149 PrefService::UNSYNCABLE_PREF); | 154 PrefService::UNSYNCABLE_PREF); |
| 150 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults, | 155 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults, |
| 151 true, | 156 true, |
| 152 PrefService::UNSYNCABLE_PREF); | 157 PrefService::UNSYNCABLE_PREF); |
| 153 #if defined(TOOLKIT_USES_GTK) | 158 #if defined(TOOLKIT_USES_GTK) |
| (...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 870 }; | 875 }; |
| 871 #endif | 876 #endif |
| 872 | 877 |
| 873 Profile* Profile::CreateOffTheRecordProfile() { | 878 Profile* Profile::CreateOffTheRecordProfile() { |
| 874 #if defined(OS_CHROMEOS) | 879 #if defined(OS_CHROMEOS) |
| 875 if (Profile::IsGuestSession()) | 880 if (Profile::IsGuestSession()) |
| 876 return new GuestSessionProfile(this); | 881 return new GuestSessionProfile(this); |
| 877 #endif | 882 #endif |
| 878 return new OffTheRecordProfileImpl(this); | 883 return new OffTheRecordProfileImpl(this); |
| 879 } | 884 } |
| OLD | NEW |