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

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

Issue 260903010: Start removing support for the experimental x-webkit-speech API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't touch histograms.xml Created 6 years, 7 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
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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 78 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
79 #include "content/renderer/drop_data_builder.h" 79 #include "content/renderer/drop_data_builder.h"
80 #include "content/renderer/external_popup_menu.h" 80 #include "content/renderer/external_popup_menu.h"
81 #include "content/renderer/geolocation_dispatcher.h" 81 #include "content/renderer/geolocation_dispatcher.h"
82 #include "content/renderer/gpu/render_widget_compositor.h" 82 #include "content/renderer/gpu/render_widget_compositor.h"
83 #include "content/renderer/history_controller.h" 83 #include "content/renderer/history_controller.h"
84 #include "content/renderer/history_serialization.h" 84 #include "content/renderer/history_serialization.h"
85 #include "content/renderer/idle_user_detector.h" 85 #include "content/renderer/idle_user_detector.h"
86 #include "content/renderer/ime_event_guard.h" 86 #include "content/renderer/ime_event_guard.h"
87 #include "content/renderer/input/input_handler_manager.h" 87 #include "content/renderer/input/input_handler_manager.h"
88 #include "content/renderer/input_tag_speech_dispatcher.h"
89 #include "content/renderer/internal_document_state_data.h" 88 #include "content/renderer/internal_document_state_data.h"
90 #include "content/renderer/load_progress_tracker.h" 89 #include "content/renderer/load_progress_tracker.h"
91 #include "content/renderer/media/audio_device_factory.h" 90 #include "content/renderer/media/audio_device_factory.h"
92 #include "content/renderer/media/audio_renderer_mixer_manager.h" 91 #include "content/renderer/media/audio_renderer_mixer_manager.h"
93 #include "content/renderer/media/media_stream_dependency_factory.h" 92 #include "content/renderer/media/media_stream_dependency_factory.h"
94 #include "content/renderer/media/media_stream_dispatcher.h" 93 #include "content/renderer/media/media_stream_dispatcher.h"
95 #include "content/renderer/media/media_stream_impl.h" 94 #include "content/renderer/media/media_stream_impl.h"
96 #include "content/renderer/media/midi_dispatcher.h" 95 #include "content/renderer/media/midi_dispatcher.h"
97 #include "content/renderer/media/render_media_log.h" 96 #include "content/renderer/media/render_media_log.h"
98 #include "content/renderer/media/video_capture_impl_manager.h" 97 #include "content/renderer/media/video_capture_impl_manager.h"
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 #if defined(OS_ANDROID) 665 #if defined(OS_ANDROID)
667 top_controls_constraints_(cc::BOTH), 666 top_controls_constraints_(cc::BOTH),
668 #endif 667 #endif
669 cached_is_main_frame_pinned_to_left_(false), 668 cached_is_main_frame_pinned_to_left_(false),
670 cached_is_main_frame_pinned_to_right_(false), 669 cached_is_main_frame_pinned_to_right_(false),
671 cached_has_main_frame_horizontal_scrollbar_(false), 670 cached_has_main_frame_horizontal_scrollbar_(false),
672 cached_has_main_frame_vertical_scrollbar_(false), 671 cached_has_main_frame_vertical_scrollbar_(false),
673 has_scrolled_focused_editable_node_into_rect_(false), 672 has_scrolled_focused_editable_node_into_rect_(false),
674 push_messaging_dispatcher_(NULL), 673 push_messaging_dispatcher_(NULL),
675 geolocation_dispatcher_(NULL), 674 geolocation_dispatcher_(NULL),
676 input_tag_speech_dispatcher_(NULL),
677 speech_recognition_dispatcher_(NULL), 675 speech_recognition_dispatcher_(NULL),
678 media_stream_dispatcher_(NULL), 676 media_stream_dispatcher_(NULL),
679 browser_plugin_manager_(NULL), 677 browser_plugin_manager_(NULL),
680 media_stream_client_(NULL), 678 media_stream_client_(NULL),
681 web_user_media_client_(NULL), 679 web_user_media_client_(NULL),
682 midi_dispatcher_(NULL), 680 midi_dispatcher_(NULL),
683 devtools_agent_(NULL), 681 devtools_agent_(NULL),
684 accessibility_mode_(AccessibilityModeOff), 682 accessibility_mode_(AccessibilityModeOff),
685 renderer_accessibility_(NULL), 683 renderer_accessibility_(NULL),
686 mouse_lock_dispatcher_(NULL), 684 mouse_lock_dispatcher_(NULL),
(...skipping 3231 matching lines...) Expand 10 before | Expand all | Expand 10 after
3918 } 3916 }
3919 return true; 3917 return true;
3920 } 3918 }
3921 3919
3922 blink::WebGeolocationClient* RenderViewImpl::geolocationClient() { 3920 blink::WebGeolocationClient* RenderViewImpl::geolocationClient() {
3923 if (!geolocation_dispatcher_) 3921 if (!geolocation_dispatcher_)
3924 geolocation_dispatcher_ = new GeolocationDispatcher(this); 3922 geolocation_dispatcher_ = new GeolocationDispatcher(this);
3925 return geolocation_dispatcher_; 3923 return geolocation_dispatcher_;
3926 } 3924 }
3927 3925
3928 blink::WebSpeechInputController* RenderViewImpl::speechInputController(
3929 blink::WebSpeechInputListener* listener) {
3930 #if defined(ENABLE_INPUT_SPEECH)
3931 if (!input_tag_speech_dispatcher_)
3932 input_tag_speech_dispatcher_ =
3933 new InputTagSpeechDispatcher(this, listener);
3934 #endif
3935 return input_tag_speech_dispatcher_;
3936 }
3937
3938 blink::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() { 3926 blink::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() {
3939 if (!speech_recognition_dispatcher_) 3927 if (!speech_recognition_dispatcher_)
3940 speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this); 3928 speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this);
3941 return speech_recognition_dispatcher_; 3929 return speech_recognition_dispatcher_;
3942 } 3930 }
3943 3931
3944 void RenderViewImpl::zoomLimitsChanged(double minimum_level, 3932 void RenderViewImpl::zoomLimitsChanged(double minimum_level,
3945 double maximum_level) { 3933 double maximum_level) {
3946 // For now, don't remember plugin zoom values. We don't want to mix them with 3934 // For now, don't remember plugin zoom values. We don't want to mix them with
3947 // normal web content (i.e. a fixed layout plugin would usually want them 3935 // normal web content (i.e. a fixed layout plugin would usually want them
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
4389 std::vector<gfx::Size> sizes; 4377 std::vector<gfx::Size> sizes;
4390 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4378 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4391 if (!url.isEmpty()) 4379 if (!url.isEmpty())
4392 urls.push_back( 4380 urls.push_back(
4393 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4381 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4394 } 4382 }
4395 SendUpdateFaviconURL(urls); 4383 SendUpdateFaviconURL(urls);
4396 } 4384 }
4397 4385
4398 } // namespace content 4386 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/shell/renderer/test_runner/MockWebSpeechInputController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698