| 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 // 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 #include "content/public/common/process_type.h" | 131 #include "content/public/common/process_type.h" |
| 132 #include "content/public/common/result_codes.h" | 132 #include "content/public/common/result_codes.h" |
| 133 #include "content/public/common/sandboxed_process_launcher_delegate.h" | 133 #include "content/public/common/sandboxed_process_launcher_delegate.h" |
| 134 #include "content/public/common/url_constants.h" | 134 #include "content/public/common/url_constants.h" |
| 135 #include "gpu/command_buffer/service/gpu_switches.h" | 135 #include "gpu/command_buffer/service/gpu_switches.h" |
| 136 #include "ipc/ipc_channel.h" | 136 #include "ipc/ipc_channel.h" |
| 137 #include "ipc/ipc_logging.h" | 137 #include "ipc/ipc_logging.h" |
| 138 #include "ipc/ipc_switches.h" | 138 #include "ipc/ipc_switches.h" |
| 139 #include "media/base/media_switches.h" | 139 #include "media/base/media_switches.h" |
| 140 #include "mojo/common/common_type_converters.h" | 140 #include "mojo/common/common_type_converters.h" |
| 141 #include "mojo/public/cpp/bindings/allocation_scope.h" | |
| 142 #include "net/url_request/url_request_context_getter.h" | 141 #include "net/url_request/url_request_context_getter.h" |
| 143 #include "ppapi/shared_impl/ppapi_switches.h" | 142 #include "ppapi/shared_impl/ppapi_switches.h" |
| 144 #include "third_party/skia/include/core/SkBitmap.h" | 143 #include "third_party/skia/include/core/SkBitmap.h" |
| 145 #include "ui/base/ui_base_switches.h" | 144 #include "ui/base/ui_base_switches.h" |
| 146 #include "ui/events/event_switches.h" | 145 #include "ui/events/event_switches.h" |
| 147 #include "ui/gfx/switches.h" | 146 #include "ui/gfx/switches.h" |
| 148 #include "ui/gl/gl_switches.h" | 147 #include "ui/gl/gl_switches.h" |
| 149 #include "ui/native_theme/native_theme_switches.h" | 148 #include "ui/native_theme/native_theme_switches.h" |
| 150 #include "webkit/browser/fileapi/sandbox_file_system_backend.h" | 149 #include "webkit/browser/fileapi/sandbox_file_system_backend.h" |
| 151 #include "webkit/common/resource_type.h" | 150 #include "webkit/common/resource_type.h" |
| (...skipping 1915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2067 if (worker_ref_count_ == 0) | 2066 if (worker_ref_count_ == 0) |
| 2068 Cleanup(); | 2067 Cleanup(); |
| 2069 } | 2068 } |
| 2070 | 2069 |
| 2071 void RenderProcessHostImpl::ConnectTo( | 2070 void RenderProcessHostImpl::ConnectTo( |
| 2072 const base::StringPiece& service_name, | 2071 const base::StringPiece& service_name, |
| 2073 mojo::ScopedMessagePipeHandle handle) { | 2072 mojo::ScopedMessagePipeHandle handle) { |
| 2074 mojo_activation_required_ = true; | 2073 mojo_activation_required_ = true; |
| 2075 MaybeActivateMojo(); | 2074 MaybeActivateMojo(); |
| 2076 | 2075 |
| 2077 mojo::AllocationScope scope; | 2076 mojo_application_host_->shell_client()->AcceptConnection( |
| 2078 mojo_application_host_->shell_client()->AcceptConnection(service_name, | 2077 mojo::String::From(service_name), handle.Pass()); |
| 2079 handle.Pass()); | |
| 2080 } | 2078 } |
| 2081 | 2079 |
| 2082 } // namespace content | 2080 } // namespace content |
| OLD | NEW |