webkit/tools/test_shell/test_shell.cc - Issue 8222025: Allow speech input feature to be disabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/tools/test_shell/test_shell.cc

Issue 8222025: Allow speech input feature to be disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Enable speech input by default (common.gypi) Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/tools/test_shell/test_shell.cc

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc

index 01862c531d2ce30208c6985ed9b2f71c575ef1c3..c3cd19fb07c937c369b3d9be7e18f3fb1469ea47 100644

--- a/webkit/tools/test_shell/test_shell.cc

+++ b/webkit/tools/test_shell/test_shell.cc

@@ -605,10 +605,14 @@ TestShell::device_orientation_client_mock() {

WebKit::WebSpeechInputControllerMock*

TestShell::CreateSpeechInputControllerMock(

WebKit::WebSpeechInputListener* listener) {

+#if ENABLE_INPUT_SPEECH

jam 2011/10/12 03:08:07 nit: around 10 and 11

DCHECK(!speech_input_controller_mock_.get());

speech_input_controller_mock_.reset(

WebKit::WebSpeechInputControllerMock::create(listener));

return speech_input_controller_mock_.get();

+#else

+ return NULL;

+#endif

}

WebKit::WebSpeechInputControllerMock*