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

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

Issue 9568002: Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased from master. Created 8 years, 9 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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('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) 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 PrefService::SYNCABLE_PREF); 89 PrefService::SYNCABLE_PREF);
90 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, 90 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly,
91 true, 91 true,
92 PrefService::UNSYNCABLE_PREF); 92 PrefService::UNSYNCABLE_PREF);
93 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, 93 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled,
94 true, 94 true,
95 PrefService::SYNCABLE_PREF); 95 PrefService::SYNCABLE_PREF);
96 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled, 96 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled,
97 false, 97 false,
98 PrefService::UNSYNCABLE_PREF); 98 PrefService::UNSYNCABLE_PREF);
99 // TODO(erg): kSpeechInputFilterProfanities should also be moved to 99 // TODO(erg): kSpeechRecognitionFilterProfanities should also be moved to
100 // speech_input_extension_manager.cc, but is more involved because of 100 // speech_input_extension_manager.cc, but is more involved because of
101 // BrowserContext/Profile confusion because of ChromeSpeechInputPreferences. 101 // BrowserContext/Profile confusion because of ChromeSpeechInputPreferences.
102 prefs->RegisterBooleanPref(prefs::kSpeechInputFilterProfanities, 102 prefs->RegisterBooleanPref(prefs::kSpeechRecognitionFilterProfanities,
103 true, 103 true,
104 PrefService::UNSYNCABLE_PREF); 104 PrefService::UNSYNCABLE_PREF);
105 prefs->RegisterBooleanPref(prefs::kDisableExtensions, 105 prefs->RegisterBooleanPref(prefs::kDisableExtensions,
106 false, 106 false,
107 PrefService::UNSYNCABLE_PREF); 107 PrefService::UNSYNCABLE_PREF);
108 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref, 108 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref,
109 false, PrefService::UNSYNCABLE_PREF); 109 false, PrefService::UNSYNCABLE_PREF);
110 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, 110 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory,
111 "", 111 "",
112 PrefService::UNSYNCABLE_PREF); 112 PrefService::UNSYNCABLE_PREF);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 return is_guest_session; 157 return is_guest_session;
158 #else 158 #else
159 return false; 159 return false;
160 #endif 160 #endif
161 } 161 }
162 162
163 bool Profile::IsSyncAccessible() { 163 bool Profile::IsSyncAccessible() {
164 browser_sync::SyncPrefs prefs(GetPrefs()); 164 browser_sync::SyncPrefs prefs(GetPrefs());
165 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged(); 165 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged();
166 } 166 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698