| Index: chrome/renderer/render_thread.cc
|
| diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
|
| index 70dbe8c3f32f36dbd025e01784fe6872babf8baa..2935304cc6ccbec2884acefb32e099d6b9adb9c7 100644
|
| --- a/chrome/renderer/render_thread.cc
|
| +++ b/chrome/renderer/render_thread.cc
|
| @@ -268,7 +268,6 @@ void RenderThread::Init() {
|
| is_extension_process_ = type_str == switches::kExtensionProcess ||
|
| CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
|
| is_incognito_process_ = false;
|
| - is_speech_input_enabled_ = false;
|
| suspend_webkit_shared_timer_ = true;
|
| notify_webkit_of_modal_loop_ = true;
|
| plugin_refresh_allowed_ = true;
|
| @@ -659,18 +658,11 @@ bool RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
|
| OnSpellCheckEnableAutoSpellCorrect)
|
| IPC_MESSAGE_HANDLER(ViewMsg_GpuChannelEstablished, OnGpuChannelEstablished)
|
| IPC_MESSAGE_HANDLER(ViewMsg_SetPhishingModel, OnSetPhishingModel)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_SetFeatureEnabled,
|
| - OnSetSpeechInputEnabled)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| }
|
|
|
| -void RenderThread::OnSetSpeechInputEnabled(bool enabled) {
|
| - DCHECK(!webkit_client_.get());
|
| - is_speech_input_enabled_ = enabled;
|
| -}
|
| -
|
| void RenderThread::OnSetNextPageID(int32 next_page_id) {
|
| // This should only be called at process initialization time, so we shouldn't
|
| // have to worry about thread-safety.
|
| @@ -968,7 +960,8 @@ void RenderThread::EnsureWebKitInitialized() {
|
| WebRuntimeFeatures::enableDeviceOrientation(
|
| !command_line.HasSwitch(switches::kDisableDeviceOrientation));
|
|
|
| - WebRuntimeFeatures::enableSpeechInput(is_speech_input_enabled_);
|
| + WebRuntimeFeatures::enableSpeechInput(
|
| + !command_line.HasSwitch(switches::kDisableSpeechInput));
|
|
|
| WebRuntimeFeatures::enableFileSystem(
|
| !command_line.HasSwitch(switches::kDisableFileSystem));
|
|
|