Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 9289007: Profiles: Move the Spelling system onto a ProfileKeyedServiceFactory. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove stray mark Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "content/browser/appcache/chrome_appcache_service.h" 47 #include "content/browser/appcache/chrome_appcache_service.h"
48 #include "content/browser/chrome_blob_storage_context.h" 48 #include "content/browser/chrome_blob_storage_context.h"
49 #include "content/browser/file_system/browser_file_system_helper.h" 49 #include "content/browser/file_system/browser_file_system_helper.h"
50 #include "content/browser/host_zoom_map.h" 50 #include "content/browser/host_zoom_map.h"
51 #include "content/browser/in_process_webkit/webkit_context.h" 51 #include "content/browser/in_process_webkit/webkit_context.h"
52 #include "content/browser/ssl/ssl_host_state.h" 52 #include "content/browser/ssl/ssl_host_state.h"
53 #include "content/public/browser/browser_thread.h" 53 #include "content/public/browser/browser_thread.h"
54 #include "content/public/browser/download_manager.h" 54 #include "content/public/browser/download_manager.h"
55 #include "content/public/browser/web_contents.h" 55 #include "content/public/browser/web_contents.h"
56 #include "content/public/browser/web_ui.h" 56 #include "content/public/browser/web_ui.h"
57 #include "grit/locale_settings.h"
58 #include "ui/base/resource/resource_bundle.h" 57 #include "ui/base/resource/resource_bundle.h"
59 #include "webkit/database/database_tracker.h" 58 #include "webkit/database/database_tracker.h"
60 #include "webkit/quota/quota_manager.h" 59 #include "webkit/quota/quota_manager.h"
61 60
62 #if defined(TOOLKIT_USES_GTK) 61 #if defined(TOOLKIT_USES_GTK)
63 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 62 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
64 #endif 63 #endif
65 64
66 using base::Time; 65 using base::Time;
67 using base::TimeDelta; 66 using base::TimeDelta;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 PrefService::SYNCABLE_PREF); 114 PrefService::SYNCABLE_PREF);
116 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, 115 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly,
117 true, 116 true,
118 PrefService::UNSYNCABLE_PREF); 117 PrefService::UNSYNCABLE_PREF);
119 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, 118 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled,
120 true, 119 true,
121 PrefService::SYNCABLE_PREF); 120 PrefService::SYNCABLE_PREF);
122 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled, 121 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled,
123 false, 122 false,
124 PrefService::UNSYNCABLE_PREF); 123 PrefService::UNSYNCABLE_PREF);
125 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
126 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary,
127 IDS_SPELLCHECK_DICTIONARY,
128 PrefService::UNSYNCABLE_PREF);
129 prefs->RegisterBooleanPref(prefs::kSpellCheckUseSpellingService,
130 false,
131 PrefService::UNSYNCABLE_PREF);
132 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck,
133 true,
134 PrefService::SYNCABLE_PREF);
135 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect,
136 true,
137 PrefService::UNSYNCABLE_PREF);
138 prefs->RegisterBooleanPref(prefs::kSpeechInputFilterProfanities, 124 prefs->RegisterBooleanPref(prefs::kSpeechInputFilterProfanities,
139 true, 125 true,
140 PrefService::UNSYNCABLE_PREF); 126 PrefService::UNSYNCABLE_PREF);
141 prefs->RegisterBooleanPref(prefs::kSpeechInputTrayNotificationShown, 127 prefs->RegisterBooleanPref(prefs::kSpeechInputTrayNotificationShown,
142 false, 128 false,
143 PrefService::UNSYNCABLE_PREF); 129 PrefService::UNSYNCABLE_PREF);
144 #if defined(TOOLKIT_USES_GTK) 130 #if defined(TOOLKIT_USES_GTK)
145 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, 131 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
146 GtkThemeService::DefaultUsesSystemTheme(), 132 GtkThemeService::DefaultUsesSystemTheme(),
147 PrefService::UNSYNCABLE_PREF); 133 PrefService::UNSYNCABLE_PREF);
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 return is_guest_session; 201 return is_guest_session;
216 #else 202 #else
217 return false; 203 return false;
218 #endif 204 #endif
219 } 205 }
220 206
221 bool Profile::IsSyncAccessible() { 207 bool Profile::IsSyncAccessible() {
222 browser_sync::SyncPrefs prefs(GetPrefs()); 208 browser_sync::SyncPrefs prefs(GetPrefs());
223 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged(); 209 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged();
224 } 210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698