Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 9500473c903e6ae554036469e47842ea36cf52b3..307344a600a188c36317907abae3f654328e6638 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -71,7 +71,7 @@ |
#include "chrome/browser/search_engines/template_url_service.h" |
#include "chrome/browser/sessions/session_service_factory.h" |
#include "chrome/browser/signin/token_service.h" |
-#include "chrome/browser/speech/chrome_speech_input_preferences.h" |
+#include "chrome/browser/speech/chrome_speech_recognition_preferences.h" |
#include "chrome/browser/sync/profile_sync_service_factory.h" |
#include "chrome/browser/transport_security_persister.h" |
#include "chrome/browser/ui/browser_init.h" |
@@ -283,7 +283,7 @@ ProfileImpl::ProfileImpl(const FilePath& path, |
void ProfileImpl::DoFinalInit() { |
PrefService* prefs = GetPrefs(); |
pref_change_registrar_.Init(prefs); |
- pref_change_registrar_.Add(prefs::kSpeechInputFilterProfanities, this); |
+ pref_change_registrar_.Add(prefs::kSpeechRecognitionFilterProfanities, this); |
pref_change_registrar_.Add(prefs::kClearSiteDataOnExit, this); |
pref_change_registrar_.Add(prefs::kGoogleServicesUsername, this); |
pref_change_registrar_.Add(prefs::kDefaultZoomLevel, this); |
@@ -891,12 +891,14 @@ content::GeolocationPermissionContext* |
return geolocation_permission_context_.get(); |
} |
-content::SpeechInputPreferences* ProfileImpl::GetSpeechInputPreferences() { |
+content::SpeechRecognitionPreferences* |
+ ProfileImpl::GetSpeechRecognitionPreferences() { |
#if defined(ENABLE_INPUT_SPEECH) |
- if (!speech_input_preferences_.get()) { |
- speech_input_preferences_ = new ChromeSpeechInputPreferences(GetPrefs()); |
+ if (!speech_recognition_preferences_.get()) { |
+ speech_recognition_preferences_ = |
+ new ChromeSpeechRecognitionPreferences(GetPrefs()); |
} |
- return speech_input_preferences_.get(); |
+ return speech_recognition_preferences_.get(); |
#else |
return NULL; |
#endif |
@@ -1184,12 +1186,12 @@ void ProfileImpl::Observe(int type, |
std::string* pref_name_in = content::Details<std::string>(details).ptr(); |
PrefService* prefs = content::Source<PrefService>(source).ptr(); |
DCHECK(pref_name_in && prefs); |
- if (*pref_name_in == prefs::kSpeechInputFilterProfanities) { |
- content::SpeechInputPreferences* speech_prefs = |
- GetSpeechInputPreferences(); |
+ if (*pref_name_in == prefs::kSpeechRecognitionFilterProfanities) { |
+ content::SpeechRecognitionPreferences* speech_prefs = |
+ GetSpeechRecognitionPreferences(); |
if (speech_prefs) { |
speech_prefs->SetFilterProfanities(prefs->GetBoolean( |
- prefs::kSpeechInputFilterProfanities)); |
+ prefs::kSpeechRecognitionFilterProfanities)); |
} |
} else if (*pref_name_in == prefs::kClearSiteDataOnExit) { |
clear_local_state_on_exit_ = |