| 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 #include "content/browser/renderer_host/dwrite_font_proxy_message_filter_win.h" | 213 #include "content/browser/renderer_host/dwrite_font_proxy_message_filter_win.h" |
| 214 #include "content/common/font_cache_dispatcher_win.h" | 214 #include "content/common/font_cache_dispatcher_win.h" |
| 215 #include "content/common/sandbox_win.h" | 215 #include "content/common/sandbox_win.h" |
| 216 #include "sandbox/win/src/sandbox_policy.h" | 216 #include "sandbox/win/src/sandbox_policy.h" |
| 217 #include "ui/display/win/dpi.h" | 217 #include "ui/display/win/dpi.h" |
| 218 #endif | 218 #endif |
| 219 | 219 |
| 220 #if defined(OS_MACOSX) | 220 #if defined(OS_MACOSX) |
| 221 #include "content/browser/bootstrap_sandbox_manager_mac.h" | 221 #include "content/browser/bootstrap_sandbox_manager_mac.h" |
| 222 #include "content/browser/mach_broker_mac.h" | 222 #include "content/browser/mach_broker_mac.h" |
| 223 #include "content/browser/shapedetection/face_detection_service_dispatcher.h" | |
| 224 #endif | 223 #endif |
| 225 | 224 |
| 226 #if defined(OS_POSIX) | 225 #if defined(OS_POSIX) |
| 227 #include "content/browser/zygote_host/zygote_communication_linux.h" | 226 #include "content/browser/zygote_host/zygote_communication_linux.h" |
| 228 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 227 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
| 229 #include "content/public/browser/zygote_handle_linux.h" | 228 #include "content/public/browser/zygote_handle_linux.h" |
| 230 #endif // defined(OS_POSIX) | 229 #endif // defined(OS_POSIX) |
| 231 | 230 |
| 232 #if defined(USE_OZONE) | 231 #if defined(USE_OZONE) |
| 233 #include "ui/ozone/public/ozone_switches.h" | 232 #include "ui/ozone/public/ozone_switches.h" |
| (...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1190 #endif | 1189 #endif |
| 1191 } | 1190 } |
| 1192 | 1191 |
| 1193 void RenderProcessHostImpl::RegisterMojoInterfaces() { | 1192 void RenderProcessHostImpl::RegisterMojoInterfaces() { |
| 1194 auto registry = base::MakeUnique<service_manager::InterfaceRegistry>( | 1193 auto registry = base::MakeUnique<service_manager::InterfaceRegistry>( |
| 1195 service_manager::mojom::kServiceManager_ConnectorSpec); | 1194 service_manager::mojom::kServiceManager_ConnectorSpec); |
| 1196 | 1195 |
| 1197 channel_->AddAssociatedInterfaceForIOThread( | 1196 channel_->AddAssociatedInterfaceForIOThread( |
| 1198 base::Bind(&IndexedDBDispatcherHost::AddBinding, indexed_db_factory_)); | 1197 base::Bind(&IndexedDBDispatcherHost::AddBinding, indexed_db_factory_)); |
| 1199 | 1198 |
| 1200 #if defined(OS_MACOSX) | |
| 1201 AddUIThreadInterface( | |
| 1202 registry.get(), | |
| 1203 base::Bind(&FaceDetectionServiceDispatcher::CreateMojoService)); | |
| 1204 #endif | |
| 1205 | |
| 1206 #if defined(OS_ANDROID) | 1199 #if defined(OS_ANDROID) |
| 1207 AddUIThreadInterface(registry.get(), | 1200 AddUIThreadInterface(registry.get(), |
| 1208 GetGlobalJavaInterfaces() | 1201 GetGlobalJavaInterfaces() |
| 1209 ->CreateInterfaceFactory<device::BatteryMonitor>()); | 1202 ->CreateInterfaceFactory<device::BatteryMonitor>()); |
| 1210 AddUIThreadInterface( | 1203 AddUIThreadInterface( |
| 1211 registry.get(), GetGlobalJavaInterfaces() | 1204 registry.get(), GetGlobalJavaInterfaces() |
| 1212 ->CreateInterfaceFactory< | 1205 ->CreateInterfaceFactory< |
| 1213 shape_detection::mojom::FaceDetectionProvider>()); | 1206 shape_detection::mojom::FaceDetectionProvider>()); |
| 1214 AddUIThreadInterface( | 1207 AddUIThreadInterface( |
| 1215 registry.get(), | 1208 registry.get(), |
| (...skipping 1836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3052 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; | 3045 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; |
| 3053 | 3046 |
| 3054 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. | 3047 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. |
| 3055 // Capture the error message in a crash key value. | 3048 // Capture the error message in a crash key value. |
| 3056 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); | 3049 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); |
| 3057 bad_message::ReceivedBadMessage(render_process_id, | 3050 bad_message::ReceivedBadMessage(render_process_id, |
| 3058 bad_message::RPH_MOJO_PROCESS_ERROR); | 3051 bad_message::RPH_MOJO_PROCESS_ERROR); |
| 3059 } | 3052 } |
| 3060 | 3053 |
| 3061 } // namespace content | 3054 } // namespace content |
| OLD | NEW |