summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_view_impl.cc
diff options
context:
space:
mode:
authorprimiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 11:01:02 +0000
committerprimiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 11:01:02 +0000
commitc52b28964090204b87634b396823c3709855079c (patch)
tree1e8e20c58dd735baa7f8312dc115fff224e4e5cd /content/renderer/render_view_impl.cc
parent9104f7e80f0bd0c2353254ec5c354199d965f44d (diff)
downloadchromium_src-c52b28964090204b87634b396823c3709855079c.zip
chromium_src-c52b28964090204b87634b396823c3709855079c.tar.gz
chromium_src-c52b28964090204b87634b396823c3709855079c.tar.bz2
Renamed speech recognition code in preparation for introducing a new speech implementation.
- The general-purpose speech recognition classes (that will be needed also by future code) have been renamed to SpeechRecognition*; - The IPC Messages and dispatcher(host) classes that are only related to the current input tag (x-webkit-speech) support have been renamed to InputTagSpeech*; - The namespace has been renamed from speech_input to speech; BUG=116954 TEST= Review URL: https://chromiumcodereview.appspot.com/9568002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
-rw-r--r--content/renderer/render_view_impl.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9f34b6c..fcd507d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -56,6 +56,7 @@
#include "content/renderer/external_popup_menu.h"
#include "content/renderer/geolocation_dispatcher.h"
#include "content/renderer/idle_user_detector.h"
+#include "content/renderer/input_tag_speech_dispatcher.h"
#include "content/renderer/web_intents_host.h"
#include "content/renderer/java/java_bridge_dispatcher.h"
#include "content/renderer/load_progress_tracker.h"
@@ -78,7 +79,6 @@
#include "content/renderer/renderer_accessibility.h"
#include "content/renderer/renderer_webapplicationcachehost_impl.h"
#include "content/renderer/renderer_webstoragenamespace_impl.h"
-#include "content/renderer/speech_input_dispatcher.h"
#include "content/renderer/text_input_client_observer.h"
#include "content/renderer/v8_value_converter_impl.h"
#include "content/renderer/web_ui_bindings.h"
@@ -444,7 +444,7 @@ RenderViewImpl::RenderViewImpl(
queried_for_swapbuffers_complete_callback_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
geolocation_dispatcher_(NULL),
- speech_input_dispatcher_(NULL),
+ input_tag_speech_dispatcher_(NULL),
device_orientation_dispatcher_(NULL),
media_stream_dispatcher_(NULL),
p2p_socket_dispatcher_(NULL),
@@ -4910,10 +4910,11 @@ WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() {
WebKit::WebSpeechInputController* RenderViewImpl::speechInputController(
WebKit::WebSpeechInputListener* listener) {
#if defined(ENABLE_INPUT_SPEECH)
- if (!speech_input_dispatcher_)
- speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener);
+ if (!input_tag_speech_dispatcher_)
+ input_tag_speech_dispatcher_ =
+ new InputTagSpeechDispatcher(this, listener);
#endif
- return speech_input_dispatcher_;
+ return input_tag_speech_dispatcher_;
}
WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() {