Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side 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: Make change suggestions. 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #undef LOG 5 #undef LOG
6 6
7 #include "webkit/tools/test_shell/test_shell.h" 7 #include "webkit/tools/test_shell/test_shell.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 device_orientation_client_mock_.reset( 599 device_orientation_client_mock_.reset(
600 WebKit::WebDeviceOrientationClientMock::create()); 600 WebKit::WebDeviceOrientationClientMock::create());
601 } 601 }
602 return device_orientation_client_mock_.get(); 602 return device_orientation_client_mock_.get();
603 } 603 }
604 604
605 WebKit::WebSpeechInputControllerMock* 605 WebKit::WebSpeechInputControllerMock*
606 TestShell::CreateSpeechInputControllerMock( 606 TestShell::CreateSpeechInputControllerMock(
607 WebKit::WebSpeechInputListener* listener) { 607 WebKit::WebSpeechInputListener* listener) {
608 DCHECK(!speech_input_controller_mock_.get()); 608 DCHECK(!speech_input_controller_mock_.get());
609 #if defined(ENABLE_INPUT_SPEECH)
609 speech_input_controller_mock_.reset( 610 speech_input_controller_mock_.reset(
610 WebKit::WebSpeechInputControllerMock::create(listener)); 611 WebKit::WebSpeechInputControllerMock::create(listener));
612 #endif
611 return speech_input_controller_mock_.get(); 613 return speech_input_controller_mock_.get();
612 } 614 }
613 615
614 WebKit::WebSpeechInputControllerMock* 616 WebKit::WebSpeechInputControllerMock*
615 TestShell::speech_input_controller_mock() { 617 TestShell::speech_input_controller_mock() {
616 return speech_input_controller_mock_.get(); 618 return speech_input_controller_mock_.get();
617 } 619 }
618 620
619 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() { 621 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
620 if (!geolocation_client_mock_.get()) { 622 if (!geolocation_client_mock_.get()) {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 webkit::WebPluginInfo plugin_info = plugins->at(i); 667 webkit::WebPluginInfo plugin_info = plugins->at(i);
666 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { 668 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
667 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { 669 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
668 plugins->erase(plugins->begin() + i); 670 plugins->erase(plugins->begin() + i);
669 } 671 }
670 } 672 }
671 } 673 }
672 } 674 }
673 675
674 } // namespace webkit_glue 676 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698