| OLD | NEW |
| 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 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1124 mojo::shell::mojom::InterfaceProviderRequest services, | 1124 mojo::shell::mojom::InterfaceProviderRequest services, |
| 1125 mojo::shell::mojom::InterfaceProviderPtr exposed_services) { | 1125 mojo::shell::mojom::InterfaceProviderPtr exposed_services) { |
| 1126 std::pair<PendingRenderFrameConnectMap::iterator, bool> result = | 1126 std::pair<PendingRenderFrameConnectMap::iterator, bool> result = |
| 1127 pending_render_frame_connects_.insert(std::make_pair( | 1127 pending_render_frame_connects_.insert(std::make_pair( |
| 1128 routing_id, | 1128 routing_id, |
| 1129 make_scoped_refptr(new PendingRenderFrameConnect( | 1129 make_scoped_refptr(new PendingRenderFrameConnect( |
| 1130 routing_id, std::move(services), std::move(exposed_services))))); | 1130 routing_id, std::move(services), std::move(exposed_services))))); |
| 1131 CHECK(result.second) << "Inserting a duplicate item."; | 1131 CHECK(result.second) << "Inserting a duplicate item."; |
| 1132 } | 1132 } |
| 1133 | 1133 |
| 1134 StoragePartitionService* RenderThreadImpl::GetStoragePartitionService() { | 1134 mojom::StoragePartitionService* RenderThreadImpl::GetStoragePartitionService() { |
| 1135 return storage_partition_service_.get(); | 1135 return storage_partition_service_.get(); |
| 1136 } | 1136 } |
| 1137 | 1137 |
| 1138 int RenderThreadImpl::GenerateRoutingID() { | 1138 int RenderThreadImpl::GenerateRoutingID() { |
| 1139 int routing_id = MSG_ROUTING_NONE; | 1139 int routing_id = MSG_ROUTING_NONE; |
| 1140 Send(new ViewHostMsg_GenerateRoutingID(&routing_id)); | 1140 Send(new ViewHostMsg_GenerateRoutingID(&routing_id)); |
| 1141 return routing_id; | 1141 return routing_id; |
| 1142 } | 1142 } |
| 1143 | 1143 |
| 1144 void RenderThreadImpl::AddFilter(IPC::MessageFilter* filter) { | 1144 void RenderThreadImpl::AddFilter(IPC::MessageFilter* filter) { |
| (...skipping 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2177 } | 2177 } |
| 2178 | 2178 |
| 2179 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2179 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2180 size_t erased = | 2180 size_t erased = |
| 2181 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2181 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2182 routing_id_); | 2182 routing_id_); |
| 2183 DCHECK_EQ(1u, erased); | 2183 DCHECK_EQ(1u, erased); |
| 2184 } | 2184 } |
| 2185 | 2185 |
| 2186 } // namespace content | 2186 } // namespace content |
| OLD | NEW |