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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 9568002: Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "content/renderer/mouse_lock_dispatcher.h" 71 #include "content/renderer/mouse_lock_dispatcher.h"
72 #include "content/renderer/notification_provider.h" 72 #include "content/renderer/notification_provider.h"
73 #include "content/renderer/p2p/socket_dispatcher.h" 73 #include "content/renderer/p2p/socket_dispatcher.h"
74 #include "content/renderer/plugin_channel_host.h" 74 #include "content/renderer/plugin_channel_host.h"
75 #include "content/renderer/render_process.h" 75 #include "content/renderer/render_process.h"
76 #include "content/renderer/render_thread_impl.h" 76 #include "content/renderer/render_thread_impl.h"
77 #include "content/renderer/render_widget_fullscreen_pepper.h" 77 #include "content/renderer/render_widget_fullscreen_pepper.h"
78 #include "content/renderer/renderer_accessibility.h" 78 #include "content/renderer/renderer_accessibility.h"
79 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 79 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
80 #include "content/renderer/renderer_webstoragenamespace_impl.h" 80 #include "content/renderer/renderer_webstoragenamespace_impl.h"
81 #include "content/renderer/speech_input_dispatcher.h" 81 #include "content/renderer/speech_recognition_dispatcher.h"
82 #include "content/renderer/text_input_client_observer.h" 82 #include "content/renderer/text_input_client_observer.h"
83 #include "content/renderer/v8_value_converter_impl.h" 83 #include "content/renderer/v8_value_converter_impl.h"
84 #include "content/renderer/web_ui_bindings.h" 84 #include "content/renderer/web_ui_bindings.h"
85 #include "content/renderer/webplugin_delegate_proxy.h" 85 #include "content/renderer/webplugin_delegate_proxy.h"
86 #include "content/renderer/websharedworker_proxy.h" 86 #include "content/renderer/websharedworker_proxy.h"
87 #include "media/base/filter_collection.h" 87 #include "media/base/filter_collection.h"
88 #include "media/base/media_switches.h" 88 #include "media/base/media_switches.h"
89 #include "media/base/message_loop_factory_impl.h" 89 #include "media/base/message_loop_factory_impl.h"
90 #include "media/filters/gpu_video_decoder.h" 90 #include "media/filters/gpu_video_decoder.h"
91 #include "net/base/escape.h" 91 #include "net/base/escape.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 target_url_status_(TARGET_NONE), 436 target_url_status_(TARGET_NONE),
437 selection_text_offset_(0), 437 selection_text_offset_(0),
438 cached_is_main_frame_pinned_to_left_(false), 438 cached_is_main_frame_pinned_to_left_(false),
439 cached_is_main_frame_pinned_to_right_(false), 439 cached_is_main_frame_pinned_to_right_(false),
440 cached_has_main_frame_horizontal_scrollbar_(false), 440 cached_has_main_frame_horizontal_scrollbar_(false),
441 cached_has_main_frame_vertical_scrollbar_(false), 441 cached_has_main_frame_vertical_scrollbar_(false),
442 context_has_swapbuffers_complete_callback_(false), 442 context_has_swapbuffers_complete_callback_(false),
443 queried_for_swapbuffers_complete_callback_(false), 443 queried_for_swapbuffers_complete_callback_(false),
444 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)), 444 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
445 geolocation_dispatcher_(NULL), 445 geolocation_dispatcher_(NULL),
446 speech_input_dispatcher_(NULL), 446 speech_recognition_dispatcher_(NULL),
447 device_orientation_dispatcher_(NULL), 447 device_orientation_dispatcher_(NULL),
448 media_stream_dispatcher_(NULL), 448 media_stream_dispatcher_(NULL),
449 p2p_socket_dispatcher_(NULL), 449 p2p_socket_dispatcher_(NULL),
450 devtools_agent_(NULL), 450 devtools_agent_(NULL),
451 renderer_accessibility_(NULL), 451 renderer_accessibility_(NULL),
452 mouse_lock_dispatcher_(NULL), 452 mouse_lock_dispatcher_(NULL),
453 session_storage_namespace_id_(session_storage_namespace_id), 453 session_storage_namespace_id_(session_storage_namespace_id),
454 handling_select_range_(false), 454 handling_select_range_(false),
455 #if defined(OS_WIN) 455 #if defined(OS_WIN)
456 focused_plugin_id_(-1), 456 focused_plugin_id_(-1),
(...skipping 4458 matching lines...) Expand 10 before | Expand all | Expand 10 after
4915 4915
4916 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() { 4916 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() {
4917 if (!geolocation_dispatcher_) 4917 if (!geolocation_dispatcher_)
4918 geolocation_dispatcher_ = new GeolocationDispatcher(this); 4918 geolocation_dispatcher_ = new GeolocationDispatcher(this);
4919 return geolocation_dispatcher_; 4919 return geolocation_dispatcher_;
4920 } 4920 }
4921 4921
4922 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController( 4922 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController(
4923 WebKit::WebSpeechInputListener* listener) { 4923 WebKit::WebSpeechInputListener* listener) {
4924 #if defined(ENABLE_INPUT_SPEECH) 4924 #if defined(ENABLE_INPUT_SPEECH)
4925 if (!speech_input_dispatcher_) 4925 if (!speech_recognition_dispatcher_)
4926 speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener); 4926 speech_recognition_dispatcher_ =
4927 new SpeechRecognitionDispatcher(this, listener);
4927 #endif 4928 #endif
4928 return speech_input_dispatcher_; 4929 return speech_recognition_dispatcher_;
4929 } 4930 }
4930 4931
4931 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() { 4932 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() {
4932 if (!device_orientation_dispatcher_) 4933 if (!device_orientation_dispatcher_)
4933 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this); 4934 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this);
4934 return device_orientation_dispatcher_; 4935 return device_orientation_dispatcher_;
4935 } 4936 }
4936 4937
4937 void RenderViewImpl::zoomLimitsChanged(double minimum_level, 4938 void RenderViewImpl::zoomLimitsChanged(double minimum_level,
4938 double maximum_level) { 4939 double maximum_level) {
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
5098 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5099 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5099 return !!RenderThreadImpl::current()->compositor_thread(); 5100 return !!RenderThreadImpl::current()->compositor_thread();
5100 } 5101 }
5101 5102
5102 void RenderViewImpl::OnJavaBridgeInit() { 5103 void RenderViewImpl::OnJavaBridgeInit() {
5103 DCHECK(!java_bridge_dispatcher_.get()); 5104 DCHECK(!java_bridge_dispatcher_.get());
5104 #if defined(ENABLE_JAVA_BRIDGE) 5105 #if defined(ENABLE_JAVA_BRIDGE)
5105 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5106 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5106 #endif 5107 #endif
5107 } 5108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698