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

Side by Side Diff: content/browser/renderer_host/render_process_host_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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 #include "content/browser/renderer_host/render_view_host_impl.h" 87 #include "content/browser/renderer_host/render_view_host_impl.h"
88 #include "content/browser/renderer_host/render_widget_helper.h" 88 #include "content/browser/renderer_host/render_widget_helper.h"
89 #include "content/browser/renderer_host/render_widget_host_impl.h" 89 #include "content/browser/renderer_host/render_widget_host_impl.h"
90 #include "content/browser/renderer_host/text_input_client_message_filter.h" 90 #include "content/browser/renderer_host/text_input_client_message_filter.h"
91 #include "content/browser/renderer_host/websocket_dispatcher_host.h" 91 #include "content/browser/renderer_host/websocket_dispatcher_host.h"
92 #include "content/browser/resolve_proxy_msg_helper.h" 92 #include "content/browser/resolve_proxy_msg_helper.h"
93 #include "content/browser/service_worker/service_worker_context_wrapper.h" 93 #include "content/browser/service_worker/service_worker_context_wrapper.h"
94 #include "content/browser/service_worker/service_worker_dispatcher_host.h" 94 #include "content/browser/service_worker/service_worker_dispatcher_host.h"
95 #include "content/browser/shared_worker/shared_worker_message_filter.h" 95 #include "content/browser/shared_worker/shared_worker_message_filter.h"
96 #include "content/browser/shared_worker/worker_storage_partition.h" 96 #include "content/browser/shared_worker/worker_storage_partition.h"
97 #include "content/browser/speech/speech_recognition_dispatcher_host.h"
98 #include "content/browser/storage_partition_impl.h" 97 #include "content/browser/storage_partition_impl.h"
99 #include "content/browser/streams/stream_context.h" 98 #include "content/browser/streams/stream_context.h"
100 #include "content/browser/tracing/trace_message_filter.h" 99 #include "content/browser/tracing/trace_message_filter.h"
101 #include "content/browser/vibration/vibration_message_filter.h" 100 #include "content/browser/vibration/vibration_message_filter.h"
102 #include "content/browser/webui/web_ui_controller_factory_registry.h" 101 #include "content/browser/webui/web_ui_controller_factory_registry.h"
103 #include "content/common/child_process_host_impl.h" 102 #include "content/common/child_process_host_impl.h"
104 #include "content/common/child_process_messages.h" 103 #include "content/common/child_process_messages.h"
105 #include "content/common/content_switches_internal.h" 104 #include "content/common/content_switches_internal.h"
106 #include "content/common/gpu/gpu_messages.h" 105 #include "content/common/gpu/gpu_messages.h"
107 #include "content/common/mojo/mojo_messages.h" 106 #include "content/common/mojo/mojo_messages.h"
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 AddFilter(peer_connection_tracker_host_.get()); 759 AddFilter(peer_connection_tracker_host_.get());
761 AddFilter(new MediaStreamDispatcherHost( 760 AddFilter(new MediaStreamDispatcherHost(
762 GetID(), 761 GetID(),
763 browser_context->GetResourceContext()->GetMediaDeviceIDSalt(), 762 browser_context->GetResourceContext()->GetMediaDeviceIDSalt(),
764 media_stream_manager)); 763 media_stream_manager));
765 AddFilter(new MediaStreamTrackMetricsHost()); 764 AddFilter(new MediaStreamTrackMetricsHost());
766 #endif 765 #endif
767 #if defined(ENABLE_PLUGINS) 766 #if defined(ENABLE_PLUGINS)
768 AddFilter(new PepperRendererConnection(GetID())); 767 AddFilter(new PepperRendererConnection(GetID()));
769 #endif 768 #endif
770 AddFilter(new SpeechRecognitionDispatcherHost(
771 GetID(), storage_partition_impl_->GetURLRequestContext()));
772 AddFilter(new FileAPIMessageFilter( 769 AddFilter(new FileAPIMessageFilter(
773 GetID(), 770 GetID(),
774 storage_partition_impl_->GetURLRequestContext(), 771 storage_partition_impl_->GetURLRequestContext(),
775 storage_partition_impl_->GetFileSystemContext(), 772 storage_partition_impl_->GetFileSystemContext(),
776 ChromeBlobStorageContext::GetFor(browser_context), 773 ChromeBlobStorageContext::GetFor(browser_context),
777 StreamContext::GetFor(browser_context))); 774 StreamContext::GetFor(browser_context)));
778 AddFilter(new FileUtilitiesMessageFilter(GetID())); 775 AddFilter(new FileUtilitiesMessageFilter(GetID()));
779 AddFilter(new MimeRegistryMessageFilter()); 776 AddFilter(new MimeRegistryMessageFilter());
780 AddFilter(new DatabaseMessageFilter( 777 AddFilter(new DatabaseMessageFilter(
781 storage_partition_impl_->GetDatabaseTracker())); 778 storage_partition_impl_->GetDatabaseTracker()));
(...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after
2236 2233
2237 void RenderProcessHostImpl::DecrementWorkerRefCount() { 2234 void RenderProcessHostImpl::DecrementWorkerRefCount() {
2238 DCHECK_CURRENTLY_ON(BrowserThread::UI); 2235 DCHECK_CURRENTLY_ON(BrowserThread::UI);
2239 DCHECK_GT(worker_ref_count_, 0); 2236 DCHECK_GT(worker_ref_count_, 0);
2240 --worker_ref_count_; 2237 --worker_ref_count_;
2241 if (worker_ref_count_ == 0) 2238 if (worker_ref_count_ == 0)
2242 Cleanup(); 2239 Cleanup();
2243 } 2240 }
2244 2241
2245 } // namespace content 2242 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698