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 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1091 | 1091 |
1092 mojo_application_host_->service_registry()->AddService(base::Bind( | 1092 mojo_application_host_->service_registry()->AddService(base::Bind( |
1093 &content::ServicePortServiceImpl::Create, | 1093 &content::ServicePortServiceImpl::Create, |
1094 make_scoped_refptr(storage_partition_impl_->GetNavigatorConnectContext()), | 1094 make_scoped_refptr(storage_partition_impl_->GetNavigatorConnectContext()), |
1095 message_port_message_filter_)); | 1095 message_port_message_filter_)); |
1096 | 1096 |
1097 mojo_application_host_->service_registry()->AddService( | 1097 mojo_application_host_->service_registry()->AddService( |
1098 base::Bind(&RenderProcessHostImpl::CreateStoragePartitionService, | 1098 base::Bind(&RenderProcessHostImpl::CreateStoragePartitionService, |
1099 base::Unretained(this))); | 1099 base::Unretained(this))); |
1100 | 1100 |
| 1101 GetContentClient()->browser()->RegisterRenderProcessMojoServices( |
| 1102 mojo_application_host_->service_registry()); |
| 1103 |
1101 #if defined(OS_ANDROID) | 1104 #if defined(OS_ANDROID) |
1102 ServiceRegistrarAndroid::RegisterProcessHostServices( | 1105 ServiceRegistrarAndroid::RegisterProcessHostServices( |
1103 mojo_application_host_->service_registry_android()); | 1106 mojo_application_host_->service_registry_android()); |
| 1107 |
| 1108 GetContentClient()->browser()->RegisterRenderProcessAndroidMojoServices( |
| 1109 mojo_application_host_->service_registry_android()); |
1104 #endif | 1110 #endif |
1105 | |
1106 GetContentClient()->browser()->RegisterRenderProcessMojoServices( | |
1107 mojo_application_host_->service_registry()); | |
1108 } | 1111 } |
1109 | 1112 |
1110 void RenderProcessHostImpl::CreateStoragePartitionService( | 1113 void RenderProcessHostImpl::CreateStoragePartitionService( |
1111 mojo::InterfaceRequest<StoragePartitionService> request) { | 1114 mojo::InterfaceRequest<StoragePartitionService> request) { |
1112 // DO NOT REMOVE THIS COMMAND LINE CHECK WITHOUT SECURITY REVIEW! | 1115 // DO NOT REMOVE THIS COMMAND LINE CHECK WITHOUT SECURITY REVIEW! |
1113 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1116 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
1114 switches::kMojoLocalStorage)) { | 1117 switches::kMojoLocalStorage)) { |
1115 storage_partition_impl_->Bind(std::move(request)); | 1118 storage_partition_impl_->Bind(std::move(request)); |
1116 } | 1119 } |
1117 } | 1120 } |
(...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2815 | 2818 |
2816 // Skip widgets in other processes. | 2819 // Skip widgets in other processes. |
2817 if (rvh->GetProcess()->GetID() != GetID()) | 2820 if (rvh->GetProcess()->GetID() != GetID()) |
2818 continue; | 2821 continue; |
2819 | 2822 |
2820 rvh->OnWebkitPreferencesChanged(); | 2823 rvh->OnWebkitPreferencesChanged(); |
2821 } | 2824 } |
2822 } | 2825 } |
2823 | 2826 |
2824 } // namespace content | 2827 } // namespace content |
OLD | NEW |