diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-16 19:52:33 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-16 19:52:33 +0000 |
commit | 3e4155c723ab73c8f754a82d81f0eb247c83536f (patch) | |
tree | be008ac956b60e06eafeb8b279b9e5060f198697 /chrome | |
parent | 8e805e80a157c814796087a55d2446f0b5162340 (diff) | |
download | chromium_src-3e4155c723ab73c8f754a82d81f0eb247c83536f.zip chromium_src-3e4155c723ab73c8f754a82d81f0eb247c83536f.tar.gz chromium_src-3e4155c723ab73c8f754a82d81f0eb247c83536f.tar.bz2 |
M browser_render_process_host.cc
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index dfec7ff..7fff013 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -687,16 +687,16 @@ void BrowserRenderProcessHost::InitSpeechInput() { if (command_line.HasSwitch(switches::kDisableSpeechInput)) { enabled = false; -#if defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) } else if (!command_line.HasSwitch(switches::kEnableSpeechInput)) { - // Official Chrome builds don't have speech input enabled by default in the
- // beta and stable channels.
- std::string channel = platform_util::GetVersionStringModifier();
- enabled = (!channel.empty() && channel != "beta");
-#endif
- }
-
- Send(new ViewMsg_SpeechInput_SetFeatureEnabled(enabled));
+ // Official Chrome builds don't have speech input enabled by default in the + // beta and stable channels. + std::string channel = platform_util::GetVersionStringModifier(); + enabled = (!channel.empty() && channel != "beta"); +#endif + } + + Send(new ViewMsg_SpeechInput_SetFeatureEnabled(enabled)); } void BrowserRenderProcessHost::SendUserScriptsUpdate( |