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

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: 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
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 PrefService::SYNCABLE_PREF); 106 PrefService::SYNCABLE_PREF);
107 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, 107 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly,
108 true, 108 true,
109 PrefService::UNSYNCABLE_PREF); 109 PrefService::UNSYNCABLE_PREF);
110 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, 110 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled,
111 true, 111 true,
112 PrefService::SYNCABLE_PREF); 112 PrefService::SYNCABLE_PREF);
113 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled, 113 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled,
114 false, 114 false,
115 PrefService::UNSYNCABLE_PREF); 115 PrefService::UNSYNCABLE_PREF);
116 prefs->RegisterBooleanPref(prefs::kSpeechInputFilterProfanities, 116 prefs->RegisterBooleanPref(prefs::kSpeechRecognitionFilterProfanities,
117 true, 117 true,
118 PrefService::UNSYNCABLE_PREF); 118 PrefService::UNSYNCABLE_PREF);
119 prefs->RegisterBooleanPref(prefs::kSpeechInputTrayNotificationShown, 119 prefs->RegisterBooleanPref(prefs::kSpeechInputTrayNotificationShown,
120 false, 120 false,
121 PrefService::UNSYNCABLE_PREF); 121 PrefService::UNSYNCABLE_PREF);
122 #if defined(TOOLKIT_USES_GTK) 122 #if defined(TOOLKIT_USES_GTK)
123 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, 123 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
124 ThemeServiceGtk::DefaultUsesSystemTheme(), 124 ThemeServiceGtk::DefaultUsesSystemTheme(),
125 PrefService::UNSYNCABLE_PREF); 125 PrefService::UNSYNCABLE_PREF);
126 #endif 126 #endif
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 return is_guest_session; 193 return is_guest_session;
194 #else 194 #else
195 return false; 195 return false;
196 #endif 196 #endif
197 } 197 }
198 198
199 bool Profile::IsSyncAccessible() { 199 bool Profile::IsSyncAccessible() {
200 browser_sync::SyncPrefs prefs(GetPrefs()); 200 browser_sync::SyncPrefs prefs(GetPrefs());
201 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged(); 201 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged();
202 } 202 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698