| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 1211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1222 | 1222 |
| 1223 channel_->AddAssociatedInterfaceForIOThread( | 1223 channel_->AddAssociatedInterfaceForIOThread( |
| 1224 base::Bind(&IndexedDBDispatcherHost::AddBinding, | 1224 base::Bind(&IndexedDBDispatcherHost::AddBinding, |
| 1225 base::Unretained(indexed_db_factory_.get()))); | 1225 base::Unretained(indexed_db_factory_.get()))); |
| 1226 | 1226 |
| 1227 #if defined(OS_ANDROID) | 1227 #if defined(OS_ANDROID) |
| 1228 AddUIThreadInterface( | 1228 AddUIThreadInterface( |
| 1229 registry.get(), GetGlobalJavaInterfaces() | 1229 registry.get(), GetGlobalJavaInterfaces() |
| 1230 ->CreateInterfaceFactory< | 1230 ->CreateInterfaceFactory< |
| 1231 shape_detection::mojom::FaceDetectionProvider>()); | 1231 shape_detection::mojom::FaceDetectionProvider>()); |
| 1232 #else |
| 1232 AddUIThreadInterface( | 1233 AddUIThreadInterface( |
| 1233 registry.get(), | 1234 registry.get(), |
| 1234 GetGlobalJavaInterfaces() | 1235 base::Bind(&ForwardShapeDetectionRequest< |
| 1235 ->CreateInterfaceFactory<shape_detection::mojom::BarcodeDetection>()); | 1236 shape_detection::mojom::FaceDetectionProviderRequest>)); |
| 1236 AddUIThreadInterface( | 1237 #endif |
| 1237 registry.get(), | |
| 1238 GetGlobalJavaInterfaces() | |
| 1239 ->CreateInterfaceFactory<shape_detection::mojom::TextDetection>()); | |
| 1240 #else | |
| 1241 AddUIThreadInterface( | 1238 AddUIThreadInterface( |
| 1242 registry.get(), | 1239 registry.get(), |
| 1243 base::Bind(&ForwardShapeDetectionRequest< | 1240 base::Bind(&ForwardShapeDetectionRequest< |
| 1244 shape_detection::mojom::BarcodeDetectionRequest>)); | 1241 shape_detection::mojom::BarcodeDetectionRequest>)); |
| 1245 AddUIThreadInterface( | 1242 AddUIThreadInterface( |
| 1246 registry.get(), | 1243 registry.get(), |
| 1247 base::Bind(&ForwardShapeDetectionRequest< | 1244 base::Bind(&ForwardShapeDetectionRequest< |
| 1248 shape_detection::mojom::FaceDetectionProviderRequest>)); | |
| 1249 AddUIThreadInterface( | |
| 1250 registry.get(), | |
| 1251 base::Bind(&ForwardShapeDetectionRequest< | |
| 1252 shape_detection::mojom::TextDetectionRequest>)); | 1245 shape_detection::mojom::TextDetectionRequest>)); |
| 1253 #endif | 1246 |
| 1254 AddUIThreadInterface( | 1247 AddUIThreadInterface( |
| 1255 registry.get(), | 1248 registry.get(), |
| 1256 base::Bind(&PermissionServiceContext::CreateService, | 1249 base::Bind(&PermissionServiceContext::CreateService, |
| 1257 base::Unretained(permission_service_context_.get()))); | 1250 base::Unretained(permission_service_context_.get()))); |
| 1258 // TODO(mcasas): finalize arguments. | 1251 // TODO(mcasas): finalize arguments. |
| 1259 AddUIThreadInterface(registry.get(), base::Bind(&ImageCaptureImpl::Create)); | 1252 AddUIThreadInterface(registry.get(), base::Bind(&ImageCaptureImpl::Create)); |
| 1260 | 1253 |
| 1261 AddUIThreadInterface( | 1254 AddUIThreadInterface( |
| 1262 registry.get(), | 1255 registry.get(), |
| 1263 base::Bind( | 1256 base::Bind( |
| (...skipping 1868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3132 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; | 3125 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; |
| 3133 | 3126 |
| 3134 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. | 3127 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. |
| 3135 // Capture the error message in a crash key value. | 3128 // Capture the error message in a crash key value. |
| 3136 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); | 3129 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); |
| 3137 bad_message::ReceivedBadMessage(render_process_id, | 3130 bad_message::ReceivedBadMessage(render_process_id, |
| 3138 bad_message::RPH_MOJO_PROCESS_ERROR); | 3131 bad_message::RPH_MOJO_PROCESS_ERROR); |
| 3139 } | 3132 } |
| 3140 | 3133 |
| 3141 } // namespace content | 3134 } // namespace content |
| OLD | NEW |