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

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

Issue 8508051: Revert 109285 - Seems to have broken chrome_frame_net_tests on the win_rel trybot, stuffing up th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
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
134 PrefService::UNSYNCABLE_PREF); 134 PrefService::UNSYNCABLE_PREF);
135 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, 135 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck,
136 true, 136 true,
137 PrefService::SYNCABLE_PREF); 137 PrefService::SYNCABLE_PREF);
138 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, 138 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect,
139 true, 139 true,
140 PrefService::UNSYNCABLE_PREF); 140 PrefService::UNSYNCABLE_PREF);
141 prefs->RegisterBooleanPref(prefs::kSpeechInputFilterProfanities, 141 prefs->RegisterBooleanPref(prefs::kSpeechInputFilterProfanities,
142 true, 142 true,
143 PrefService::UNSYNCABLE_PREF); 143 PrefService::UNSYNCABLE_PREF);
144 prefs->RegisterBooleanPref(prefs::kSpeechInputTrayNotificationShown,
145 false,
146 PrefService::UNSYNCABLE_PREF);
147 #if defined(TOOLKIT_USES_GTK) 144 #if defined(TOOLKIT_USES_GTK)
148 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, 145 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
149 GtkThemeService::DefaultUsesSystemTheme(), 146 GtkThemeService::DefaultUsesSystemTheme(),
150 PrefService::UNSYNCABLE_PREF); 147 PrefService::UNSYNCABLE_PREF);
151 #endif 148 #endif
152 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, 149 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
153 FilePath(), 150 FilePath(),
154 PrefService::UNSYNCABLE_PREF); 151 PrefService::UNSYNCABLE_PREF);
155 prefs->RegisterStringPref(prefs::kCurrentThemeID, 152 prefs->RegisterStringPref(prefs::kCurrentThemeID,
156 ThemeService::kDefaultThemeID, 153 ThemeService::kDefaultThemeID,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 return is_guest_session; 215 return is_guest_session;
219 #else 216 #else
220 return false; 217 return false;
221 #endif 218 #endif
222 } 219 }
223 220
224 bool Profile::IsSyncAccessible() { 221 bool Profile::IsSyncAccessible() {
225 ProfileSyncService* syncService = GetProfileSyncService(); 222 ProfileSyncService* syncService = GetProfileSyncService();
226 return syncService && !syncService->IsManaged(); 223 return syncService && !syncService->IsManaged();
227 } 224 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_function_dispatcher.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698