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

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

Issue 7086005: Context menu for "Voice recognition options" (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: No changes (Just trying to get commit-bot to wake up) Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_command_ids.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. 125 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
126 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary, 126 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary,
127 IDS_SPELLCHECK_DICTIONARY, 127 IDS_SPELLCHECK_DICTIONARY,
128 PrefService::UNSYNCABLE_PREF); 128 PrefService::UNSYNCABLE_PREF);
129 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, 129 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck,
130 true, 130 true,
131 PrefService::SYNCABLE_PREF); 131 PrefService::SYNCABLE_PREF);
132 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, 132 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect,
133 true, 133 true,
134 PrefService::UNSYNCABLE_PREF); 134 PrefService::UNSYNCABLE_PREF);
135 prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults,
136 true,
137 PrefService::UNSYNCABLE_PREF);
135 #if defined(TOOLKIT_USES_GTK) 138 #if defined(TOOLKIT_USES_GTK)
136 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, 139 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
137 GtkThemeService::DefaultUsesSystemTheme(), 140 GtkThemeService::DefaultUsesSystemTheme(),
138 PrefService::UNSYNCABLE_PREF); 141 PrefService::UNSYNCABLE_PREF);
139 #endif 142 #endif
140 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, 143 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
141 FilePath(), 144 FilePath(),
142 PrefService::UNSYNCABLE_PREF); 145 PrefService::UNSYNCABLE_PREF);
143 prefs->RegisterStringPref(prefs::kCurrentThemeID, 146 prefs->RegisterStringPref(prefs::kCurrentThemeID,
144 ThemeService::kDefaultThemeID, 147 ThemeService::kDefaultThemeID,
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 }; 851 };
849 #endif 852 #endif
850 853
851 Profile* Profile::CreateOffTheRecordProfile() { 854 Profile* Profile::CreateOffTheRecordProfile() {
852 #if defined(OS_CHROMEOS) 855 #if defined(OS_CHROMEOS)
853 if (Profile::IsGuestSession()) 856 if (Profile::IsGuestSession())
854 return new GuestSessionProfile(this); 857 return new GuestSessionProfile(this);
855 #endif 858 #endif
856 return new OffTheRecordProfileImpl(this); 859 return new OffTheRecordProfileImpl(this);
857 } 860 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_command_ids.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698