| Index: chrome/browser/speech/speech_input_manager.cc
|
| diff --git a/chrome/browser/speech/speech_input_manager.cc b/chrome/browser/speech/speech_input_manager.cc
|
| index cbc6f12fad9acb76c1bb81063ff0fdd3dbb11460..5f65e0275c5e5abf916bdc2a9031e258790d977a 100644
|
| --- a/chrome/browser/speech/speech_input_manager.cc
|
| +++ b/chrome/browser/speech/speech_input_manager.cc
|
| @@ -7,7 +7,6 @@
|
| #include <map>
|
| #include <string>
|
|
|
| -#include "base/command_line.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/ref_counted.h"
|
| #include "base/synchronization/lock.h"
|
| @@ -163,26 +162,6 @@ SpeechInputManager* SpeechInputManager::Get() {
|
| return g_speech_input_manager_impl.Pointer();
|
| }
|
|
|
| -bool SpeechInputManager::IsFeatureEnabled() {
|
| - 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
|
| - }
|
| -
|
| - return enabled;
|
| -}
|
| -
|
| void SpeechInputManager::ShowAudioInputSettings() {
|
| // Since AudioManager::ShowAudioInputSettings can potentially launch external
|
| // processes, do that in the FILE thread to not block the calling threads.
|
|
|