summaryrefslogtreecommitdiffstats
path: root/chrome/browser/speech
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 17:24:23 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 17:24:23 +0000
commit6f1dbc0060967d9ad7c214315f1ca843777d5c7f (patch)
treeaadf54801b512ea5bae185d1c3566a8cff165f68 /chrome/browser/speech
parent63fa4b8ca21410e95af38b919852ecacc6fe5388 (diff)
downloadchromium_src-6f1dbc0060967d9ad7c214315f1ca843777d5c7f.zip
chromium_src-6f1dbc0060967d9ad7c214315f1ca843777d5c7f.tar.gz
chromium_src-6f1dbc0060967d9ad7c214315f1ca843777d5c7f.tar.bz2
Move speech input behind a flag for M8 beta and stable.
The speech input feature (http://code.google.com/p/chromium/issues/detail?id=53598) is work in progress and it should only be enabled in the dev channel but behind a flag for beta and stable. After this change gets merged with the beta branch I'll roll it back on the trunk. BUG=60918 TEST=browser_tests --gtest_filter=SpeechInputBrowserTest.* Review URL: http://codereview.chromium.org/4096005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
-rw-r--r--chrome/browser/speech/speech_input_browsertest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/speech/speech_input_browsertest.cc b/chrome/browser/speech/speech_input_browsertest.cc
index a371015..8c329925 100644
--- a/chrome/browser/speech/speech_input_browsertest.cc
+++ b/chrome/browser/speech/speech_input_browsertest.cc
@@ -92,6 +92,10 @@ SpeechInputManager* fakeManagerAccessor() {
class SpeechInputBrowserTest : public InProcessBrowserTest {
public:
// InProcessBrowserTest methods
+ virtual void SetUpCommandLine(CommandLine* command_line) {
+ command_line->AppendSwitch(switches::kEnableSpeechInput);
+ }
+
GURL testUrl(const FilePath::CharType* filename) {
const FilePath kTestDir(FILE_PATH_LITERAL("speech"));
return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));