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

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

Issue 1234413006: Move the Web Bluetooth implementation from child/ to renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Rebase Created 5 years, 5 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_thread_impl.h ('k') | no next file » | 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_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "content/common/worker_messages.h" 72 #include "content/common/worker_messages.h"
73 #include "content/public/common/content_constants.h" 73 #include "content/public/common/content_constants.h"
74 #include "content/public/common/content_paths.h" 74 #include "content/public/common/content_paths.h"
75 #include "content/public/common/content_switches.h" 75 #include "content/public/common/content_switches.h"
76 #include "content/public/common/mojo_channel_switches.h" 76 #include "content/public/common/mojo_channel_switches.h"
77 #include "content/public/common/renderer_preferences.h" 77 #include "content/public/common/renderer_preferences.h"
78 #include "content/public/common/url_constants.h" 78 #include "content/public/common/url_constants.h"
79 #include "content/public/renderer/content_renderer_client.h" 79 #include "content/public/renderer/content_renderer_client.h"
80 #include "content/public/renderer/render_process_observer.h" 80 #include "content/public/renderer/render_process_observer.h"
81 #include "content/public/renderer/render_view_visitor.h" 81 #include "content/public/renderer/render_view_visitor.h"
82 #include "content/renderer/bluetooth/bluetooth_message_filter.h"
82 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 83 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
83 #include "content/renderer/cache_storage/cache_storage_dispatcher.h" 84 #include "content/renderer/cache_storage/cache_storage_dispatcher.h"
84 #include "content/renderer/cache_storage/cache_storage_message_filter.h" 85 #include "content/renderer/cache_storage/cache_storage_message_filter.h"
85 #include "content/renderer/devtools/devtools_agent_filter.h" 86 #include "content/renderer/devtools/devtools_agent_filter.h"
86 #include "content/renderer/devtools/v8_sampling_profiler.h" 87 #include "content/renderer/devtools/v8_sampling_profiler.h"
87 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" 88 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
88 #include "content/renderer/dom_storage/webstoragearea_impl.h" 89 #include "content/renderer/dom_storage/webstoragearea_impl.h"
89 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 90 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
90 #include "content/renderer/gpu/compositor_external_begin_frame_source.h" 91 #include "content/renderer/gpu/compositor_external_begin_frame_source.h"
91 #include "content/renderer/gpu/compositor_forwarding_message_filter.h" 92 #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 audio_input_message_filter_ = 721 audio_input_message_filter_ =
721 new AudioInputMessageFilter(GetIOMessageLoopProxy()); 722 new AudioInputMessageFilter(GetIOMessageLoopProxy());
722 AddFilter(audio_input_message_filter_.get()); 723 AddFilter(audio_input_message_filter_.get());
723 724
724 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); 725 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy());
725 AddFilter(audio_message_filter_.get()); 726 AddFilter(audio_message_filter_.get());
726 727
727 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); 728 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy());
728 AddFilter(midi_message_filter_.get()); 729 AddFilter(midi_message_filter_.get());
729 730
731 bluetooth_message_filter_ = new BluetoothMessageFilter(thread_safe_sender());
732 AddFilter(bluetooth_message_filter_->GetFilter());
733
730 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); 734 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter());
731 735
732 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); 736 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter());
733 737
734 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); 738 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter());
735 739
736 GetContentClient()->renderer()->RenderThreadStarted(); 740 GetContentClient()->renderer()->RenderThreadStarted();
737 741
738 InitSkiaEventTracer(); 742 InitSkiaEventTracer();
739 743
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
2033 } 2037 }
2034 2038
2035 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2039 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2036 size_t erased = 2040 size_t erased =
2037 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2041 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2038 routing_id_); 2042 routing_id_);
2039 DCHECK_EQ(1u, erased); 2043 DCHECK_EQ(1u, erased);
2040 } 2044 }
2041 2045
2042 } // namespace content 2046 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698