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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 636863003: Make SpeechRecognition per RenderFrame instead of per RenderView. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanups Created 6 years, 1 month 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/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "content/browser/message_port_service.h" 47 #include "content/browser/message_port_service.h"
48 #include "content/browser/plugin_content_origin_whitelist.h" 48 #include "content/browser/plugin_content_origin_whitelist.h"
49 #include "content/browser/power_save_blocker_impl.h" 49 #include "content/browser/power_save_blocker_impl.h"
50 #include "content/browser/renderer_host/render_process_host_impl.h" 50 #include "content/browser/renderer_host/render_process_host_impl.h"
51 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 51 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
52 #include "content/browser/renderer_host/render_view_host_impl.h" 52 #include "content/browser/renderer_host/render_view_host_impl.h"
53 #include "content/browser/renderer_host/render_widget_host_impl.h" 53 #include "content/browser/renderer_host/render_widget_host_impl.h"
54 #include "content/browser/renderer_host/render_widget_host_view_base.h" 54 #include "content/browser/renderer_host/render_widget_host_view_base.h"
55 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h" 55 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h"
56 #include "content/browser/site_instance_impl.h" 56 #include "content/browser/site_instance_impl.h"
57 #include "content/browser/speech/speech_recognition_dispatcher_host.h"
57 #include "content/browser/web_contents/web_contents_view_guest.h" 58 #include "content/browser/web_contents/web_contents_view_guest.h"
58 #include "content/browser/webui/generic_handler.h" 59 #include "content/browser/webui/generic_handler.h"
59 #include "content/browser/webui/web_ui_controller_factory_registry.h" 60 #include "content/browser/webui/web_ui_controller_factory_registry.h"
60 #include "content/browser/webui/web_ui_impl.h" 61 #include "content/browser/webui/web_ui_impl.h"
61 #include "content/common/browser_plugin/browser_plugin_constants.h" 62 #include "content/common/browser_plugin/browser_plugin_constants.h"
62 #include "content/common/browser_plugin/browser_plugin_messages.h" 63 #include "content/common/browser_plugin/browser_plugin_messages.h"
63 #include "content/common/frame_messages.h" 64 #include "content/common/frame_messages.h"
64 #include "content/common/image_messages.h" 65 #include "content/common/image_messages.h"
65 #include "content/common/input_messages.h" 66 #include "content/common/input_messages.h"
66 #include "content/common/ssl_status_serialization.h" 67 #include "content/common/ssl_status_serialization.h"
(...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 NotificationService::AllBrowserContextsAndSources()); 1191 NotificationService::AllBrowserContextsAndSources());
1191 1192
1192 geolocation_dispatcher_host_.reset(new GeolocationDispatcherHost(this)); 1193 geolocation_dispatcher_host_.reset(new GeolocationDispatcherHost(this));
1193 midi_dispatcher_host_.reset(new MidiDispatcherHost(this)); 1194 midi_dispatcher_host_.reset(new MidiDispatcherHost(this));
1194 1195
1195 screen_orientation_dispatcher_host_.reset( 1196 screen_orientation_dispatcher_host_.reset(
1196 new ScreenOrientationDispatcherHostImpl(this)); 1197 new ScreenOrientationDispatcherHostImpl(this));
1197 1198
1198 manifest_manager_host_.reset(new ManifestManagerHost(this)); 1199 manifest_manager_host_.reset(new ManifestManagerHost(this));
1199 1200
1201 speech_recognition_dispatcher_host_.reset(
1202 new SpeechRecognitionDispatcherHost(this));
1203
1200 #if defined(OS_ANDROID) 1204 #if defined(OS_ANDROID)
1201 date_time_chooser_.reset(new DateTimeChooserAndroid()); 1205 date_time_chooser_.reset(new DateTimeChooserAndroid());
1202 #endif 1206 #endif
1203 } 1207 }
1204 1208
1205 void WebContentsImpl::OnWebContentsDestroyed(WebContentsImpl* web_contents) { 1209 void WebContentsImpl::OnWebContentsDestroyed(WebContentsImpl* web_contents) {
1206 RemoveDestructionObserver(web_contents); 1210 RemoveDestructionObserver(web_contents);
1207 1211
1208 // Clear the opener if it has been closed. 1212 // Clear the opener if it has been closed.
1209 if (web_contents == opener_) { 1213 if (web_contents == opener_) {
(...skipping 3134 matching lines...) Expand 10 before | Expand all | Expand 10 after
4344 node->render_manager()->ResumeResponseDeferredAtStart(); 4348 node->render_manager()->ResumeResponseDeferredAtStart();
4345 } 4349 }
4346 4350
4347 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4351 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4348 force_disable_overscroll_content_ = force_disable; 4352 force_disable_overscroll_content_ = force_disable;
4349 if (view_) 4353 if (view_)
4350 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4354 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4351 } 4355 }
4352 4356
4353 } // namespace content 4357 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698