Index: chrome/browser/renderer_host/browser_render_process_host.cc |
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc |
index f09fd571ec93e5ce6ab40bae4f441909f0ce60f8..d901a77ad4240ac84bbd087d2645d4bd814e3f0b 100644 |
--- a/chrome/browser/renderer_host/browser_render_process_host.cc |
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc |
@@ -65,6 +65,7 @@ |
#include "chrome/browser/safe_browsing/client_side_detection_service.h" |
#include "chrome/browser/search_engines/search_provider_install_state_message_filter.h" |
#include "chrome/browser/speech/speech_input_dispatcher_host.h" |
+#include "chrome/browser/speech/speech_input_manager.h" |
#include "chrome/browser/spellcheck_host.h" |
#include "chrome/browser/metrics/user_metrics.h" |
#include "chrome/browser/visitedlink/visitedlink_master.h" |
@@ -788,23 +789,8 @@ void BrowserRenderProcessHost::InitExtensions() { |
} |
void BrowserRenderProcessHost::InitSpeechInput() { |
- bool enabled = true; |
- const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
- |
- if (command_line.HasSwitch(switches::kDisableSpeechInput)) { |
- enabled = false; |
-#if defined(GOOGLE_CHROME_BUILD) |
- } else if (!command_line.HasSwitch(switches::kEnableSpeechInput)) { |
- // We need to evaluate whether IO is OK here. http://crbug.com/63335. |
- base::ThreadRestrictions::ScopedAllowIO allow_io; |
- // Official Chrome builds have speech input enabled by default only in the |
- // dev channel. |
- std::string channel = platform_util::GetVersionStringModifier(); |
- enabled = (channel == "dev"); |
-#endif |
- } |
- |
- Send(new ViewMsg_SpeechInput_SetFeatureEnabled(enabled)); |
+ Send(new ViewMsg_SpeechInput_SetFeatureEnabled( |
+ speech_input::SpeechInputManager::IsFeatureEnabled())); |
} |
void BrowserRenderProcessHost::SendUserScriptsUpdate( |