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

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

Issue 1851093005: Remove content/child/npapi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_combined_01_02
Patch Set: rebase Created 4 years, 8 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_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('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_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 <utility> 10 #include <utility>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "content/child/blob_storage/blob_message_filter.h" 52 #include "content/child/blob_storage/blob_message_filter.h"
53 #include "content/child/child_discardable_shared_memory_manager.h" 53 #include "content/child/child_discardable_shared_memory_manager.h"
54 #include "content/child/child_gpu_memory_buffer_manager.h" 54 #include "content/child/child_gpu_memory_buffer_manager.h"
55 #include "content/child/child_histogram_message_filter.h" 55 #include "content/child/child_histogram_message_filter.h"
56 #include "content/child/child_resource_message_filter.h" 56 #include "content/child/child_resource_message_filter.h"
57 #include "content/child/child_shared_bitmap_manager.h" 57 #include "content/child/child_shared_bitmap_manager.h"
58 #include "content/child/content_child_helpers.h" 58 #include "content/child/content_child_helpers.h"
59 #include "content/child/db_message_filter.h" 59 #include "content/child/db_message_filter.h"
60 #include "content/child/indexed_db/indexed_db_dispatcher.h" 60 #include "content/child/indexed_db/indexed_db_dispatcher.h"
61 #include "content/child/indexed_db/indexed_db_message_filter.h" 61 #include "content/child/indexed_db/indexed_db_message_filter.h"
62 #include "content/child/plugin_messages.h"
63 #include "content/child/resource_dispatcher.h" 62 #include "content/child/resource_dispatcher.h"
64 #include "content/child/resource_scheduling_filter.h" 63 #include "content/child/resource_scheduling_filter.h"
65 #include "content/child/runtime_features.h" 64 #include "content/child/runtime_features.h"
66 #include "content/child/thread_safe_sender.h" 65 #include "content/child/thread_safe_sender.h"
67 #include "content/child/web_database_observer_impl.h" 66 #include "content/child/web_database_observer_impl.h"
68 #include "content/child/worker_thread_registry.h" 67 #include "content/child/worker_thread_registry.h"
69 #include "content/common/child_process_messages.h" 68 #include "content/common/child_process_messages.h"
70 #include "content/common/content_constants_internal.h" 69 #include "content/common/content_constants_internal.h"
71 #include "content/common/database_messages.h" 70 #include "content/common/database_messages.h"
72 #include "content/common/dom_storage/dom_storage_messages.h" 71 #include "content/common/dom_storage/dom_storage_messages.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 #include "content/renderer/webscrollbarbehavior_impl_mac.h" 177 #include "content/renderer/webscrollbarbehavior_impl_mac.h"
179 #endif 178 #endif
180 179
181 #if defined(OS_POSIX) 180 #if defined(OS_POSIX)
182 #include "ipc/ipc_channel_posix.h" 181 #include "ipc/ipc_channel_posix.h"
183 #endif 182 #endif
184 183
185 #if defined(OS_WIN) 184 #if defined(OS_WIN)
186 #include <windows.h> 185 #include <windows.h>
187 #include <objbase.h> 186 #include <objbase.h>
188 #else
189 // TODO(port)
190 #include "content/child/npapi/np_channel_base.h"
191 #endif 187 #endif
192 188
193 #if defined(ENABLE_WEBRTC) 189 #if defined(ENABLE_WEBRTC)
194 #include "content/renderer/media/peer_connection_tracker.h" 190 #include "content/renderer/media/peer_connection_tracker.h"
195 #include "content/renderer/media/rtc_peer_connection_handler.h" 191 #include "content/renderer/media/rtc_peer_connection_handler.h"
196 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 192 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
197 #include "content/renderer/media/webrtc_identity_service.h" 193 #include "content/renderer/media/webrtc_identity_service.h"
198 #endif 194 #endif
199 195
200 #ifdef ENABLE_VTUNE_JIT_INTERFACE 196 #ifdef ENABLE_VTUNE_JIT_INTERFACE
(...skipping 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after
2144 } 2140 }
2145 2141
2146 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2142 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2147 size_t erased = 2143 size_t erased =
2148 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2144 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2149 routing_id_); 2145 routing_id_);
2150 DCHECK_EQ(1u, erased); 2146 DCHECK_EQ(1u, erased);
2151 } 2147 }
2152 2148
2153 } // namespace content 2149 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698