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

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: Rebased from master. 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
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/speech_input_dispatcher.h » ('j') | 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) 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "content/public/renderer/document_state.h" 49 #include "content/public/renderer/document_state.h"
50 #include "content/public/renderer/navigation_state.h" 50 #include "content/public/renderer/navigation_state.h"
51 #include "content/public/renderer/render_view_observer.h" 51 #include "content/public/renderer/render_view_observer.h"
52 #include "content/public/renderer/render_view_visitor.h" 52 #include "content/public/renderer/render_view_visitor.h"
53 #include "content/renderer/device_orientation_dispatcher.h" 53 #include "content/renderer/device_orientation_dispatcher.h"
54 #include "content/renderer/devtools_agent.h" 54 #include "content/renderer/devtools_agent.h"
55 #include "content/renderer/dom_automation_controller.h" 55 #include "content/renderer/dom_automation_controller.h"
56 #include "content/renderer/external_popup_menu.h" 56 #include "content/renderer/external_popup_menu.h"
57 #include "content/renderer/geolocation_dispatcher.h" 57 #include "content/renderer/geolocation_dispatcher.h"
58 #include "content/renderer/idle_user_detector.h" 58 #include "content/renderer/idle_user_detector.h"
59 #include "content/renderer/input_tag_speech_dispatcher.h"
59 #include "content/renderer/web_intents_host.h" 60 #include "content/renderer/web_intents_host.h"
60 #include "content/renderer/java/java_bridge_dispatcher.h" 61 #include "content/renderer/java/java_bridge_dispatcher.h"
61 #include "content/renderer/load_progress_tracker.h" 62 #include "content/renderer/load_progress_tracker.h"
62 #include "content/renderer/media/audio_message_filter.h" 63 #include "content/renderer/media/audio_message_filter.h"
63 #include "content/renderer/media/audio_renderer_impl.h" 64 #include "content/renderer/media/audio_renderer_impl.h"
64 #include "content/renderer/media/media_stream_dependency_factory.h" 65 #include "content/renderer/media/media_stream_dependency_factory.h"
65 #include "content/renderer/media/media_stream_dispatcher.h" 66 #include "content/renderer/media/media_stream_dispatcher.h"
66 #include "content/renderer/media/media_stream_impl.h" 67 #include "content/renderer/media/media_stream_impl.h"
67 #include "content/renderer/media/render_audiosourceprovider.h" 68 #include "content/renderer/media/render_audiosourceprovider.h"
68 #include "content/renderer/media/render_media_log.h" 69 #include "content/renderer/media/render_media_log.h"
69 #include "content/renderer/media/renderer_gpu_video_decoder_factories.h" 70 #include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
70 #include "content/renderer/mhtml_generator.h" 71 #include "content/renderer/mhtml_generator.h"
71 #include "content/renderer/mouse_lock_dispatcher.h" 72 #include "content/renderer/mouse_lock_dispatcher.h"
72 #include "content/renderer/notification_provider.h" 73 #include "content/renderer/notification_provider.h"
73 #include "content/renderer/p2p/socket_dispatcher.h" 74 #include "content/renderer/p2p/socket_dispatcher.h"
74 #include "content/renderer/plugin_channel_host.h" 75 #include "content/renderer/plugin_channel_host.h"
75 #include "content/renderer/render_process.h" 76 #include "content/renderer/render_process.h"
76 #include "content/renderer/render_thread_impl.h" 77 #include "content/renderer/render_thread_impl.h"
77 #include "content/renderer/render_widget_fullscreen_pepper.h" 78 #include "content/renderer/render_widget_fullscreen_pepper.h"
78 #include "content/renderer/renderer_accessibility.h" 79 #include "content/renderer/renderer_accessibility.h"
79 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 80 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
80 #include "content/renderer/renderer_webstoragenamespace_impl.h" 81 #include "content/renderer/renderer_webstoragenamespace_impl.h"
81 #include "content/renderer/speech_input_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.h" 89 #include "media/base/message_loop_factory.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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 target_url_status_(TARGET_NONE), 437 target_url_status_(TARGET_NONE),
438 selection_text_offset_(0), 438 selection_text_offset_(0),
439 cached_is_main_frame_pinned_to_left_(false), 439 cached_is_main_frame_pinned_to_left_(false),
440 cached_is_main_frame_pinned_to_right_(false), 440 cached_is_main_frame_pinned_to_right_(false),
441 cached_has_main_frame_horizontal_scrollbar_(false), 441 cached_has_main_frame_horizontal_scrollbar_(false),
442 cached_has_main_frame_vertical_scrollbar_(false), 442 cached_has_main_frame_vertical_scrollbar_(false),
443 context_has_swapbuffers_complete_callback_(false), 443 context_has_swapbuffers_complete_callback_(false),
444 queried_for_swapbuffers_complete_callback_(false), 444 queried_for_swapbuffers_complete_callback_(false),
445 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)), 445 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
446 geolocation_dispatcher_(NULL), 446 geolocation_dispatcher_(NULL),
447 speech_input_dispatcher_(NULL), 447 input_tag_speech_dispatcher_(NULL),
448 device_orientation_dispatcher_(NULL), 448 device_orientation_dispatcher_(NULL),
449 media_stream_dispatcher_(NULL), 449 media_stream_dispatcher_(NULL),
450 p2p_socket_dispatcher_(NULL), 450 p2p_socket_dispatcher_(NULL),
451 devtools_agent_(NULL), 451 devtools_agent_(NULL),
452 renderer_accessibility_(NULL), 452 renderer_accessibility_(NULL),
453 mouse_lock_dispatcher_(NULL), 453 mouse_lock_dispatcher_(NULL),
454 session_storage_namespace_id_(session_storage_namespace_id), 454 session_storage_namespace_id_(session_storage_namespace_id),
455 handling_select_range_(false), 455 handling_select_range_(false),
456 #if defined(OS_WIN) 456 #if defined(OS_WIN)
457 focused_plugin_id_(-1), 457 focused_plugin_id_(-1),
(...skipping 4445 matching lines...) Expand 10 before | Expand all | Expand 10 after
4903 4903
4904 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() { 4904 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() {
4905 if (!geolocation_dispatcher_) 4905 if (!geolocation_dispatcher_)
4906 geolocation_dispatcher_ = new GeolocationDispatcher(this); 4906 geolocation_dispatcher_ = new GeolocationDispatcher(this);
4907 return geolocation_dispatcher_; 4907 return geolocation_dispatcher_;
4908 } 4908 }
4909 4909
4910 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController( 4910 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController(
4911 WebKit::WebSpeechInputListener* listener) { 4911 WebKit::WebSpeechInputListener* listener) {
4912 #if defined(ENABLE_INPUT_SPEECH) 4912 #if defined(ENABLE_INPUT_SPEECH)
4913 if (!speech_input_dispatcher_) 4913 if (!input_tag_speech_dispatcher_)
4914 speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener); 4914 input_tag_speech_dispatcher_ =
4915 new InputTagSpeechDispatcher(this, listener);
4915 #endif 4916 #endif
4916 return speech_input_dispatcher_; 4917 return input_tag_speech_dispatcher_;
4917 } 4918 }
4918 4919
4919 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() { 4920 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() {
4920 if (!device_orientation_dispatcher_) 4921 if (!device_orientation_dispatcher_)
4921 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this); 4922 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this);
4922 return device_orientation_dispatcher_; 4923 return device_orientation_dispatcher_;
4923 } 4924 }
4924 4925
4925 void RenderViewImpl::zoomLimitsChanged(double minimum_level, 4926 void RenderViewImpl::zoomLimitsChanged(double minimum_level,
4926 double maximum_level) { 4927 double maximum_level) {
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
5086 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5087 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5087 return !!RenderThreadImpl::current()->compositor_thread(); 5088 return !!RenderThreadImpl::current()->compositor_thread();
5088 } 5089 }
5089 5090
5090 void RenderViewImpl::OnJavaBridgeInit() { 5091 void RenderViewImpl::OnJavaBridgeInit() {
5091 DCHECK(!java_bridge_dispatcher_.get()); 5092 DCHECK(!java_bridge_dispatcher_.get());
5092 #if defined(ENABLE_JAVA_BRIDGE) 5093 #if defined(ENABLE_JAVA_BRIDGE)
5093 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5094 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5094 #endif 5095 #endif
5095 } 5096 }
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/speech_input_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698