| 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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1190 switches::kNetworkCountryIso, | 1190 switches::kNetworkCountryIso, |
| 1191 switches::kDisableWebAudio, | 1191 switches::kDisableWebAudio, |
| 1192 #endif | 1192 #endif |
| 1193 #if defined(OS_MACOSX) | 1193 #if defined(OS_MACOSX) |
| 1194 // Allow this to be set when invoking the browser and relayed along. | 1194 // Allow this to be set when invoking the browser and relayed along. |
| 1195 switches::kEnableSandboxLogging, | 1195 switches::kEnableSandboxLogging, |
| 1196 #endif | 1196 #endif |
| 1197 #if defined(OS_WIN) | 1197 #if defined(OS_WIN) |
| 1198 switches::kEnableDirectWrite, | 1198 switches::kEnableDirectWrite, |
| 1199 switches::kEnableHighResolutionTime, | 1199 switches::kEnableHighResolutionTime, |
| 1200 switches::kHighDPISupport, | |
| 1201 #endif | 1200 #endif |
| 1202 }; | 1201 }; |
| 1203 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1202 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
| 1204 arraysize(kSwitchNames)); | 1203 arraysize(kSwitchNames)); |
| 1205 | 1204 |
| 1206 if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1205 if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
| 1207 BrowserMainLoop::GetInstance()->is_tracing_startup()) { | 1206 BrowserMainLoop::GetInstance()->is_tracing_startup()) { |
| 1208 // Pass kTraceStartup switch to renderer only if startup tracing has not | 1207 // Pass kTraceStartup switch to renderer only if startup tracing has not |
| 1209 // finished. | 1208 // finished. |
| 1210 renderer_cmd->AppendSwitchASCII( | 1209 renderer_cmd->AppendSwitchASCII( |
| (...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2149 | 2148 |
| 2150 void RenderProcessHostImpl::SetWebUIHandle( | 2149 void RenderProcessHostImpl::SetWebUIHandle( |
| 2151 int32 view_routing_id, | 2150 int32 view_routing_id, |
| 2152 mojo::ScopedMessagePipeHandle handle) { | 2151 mojo::ScopedMessagePipeHandle handle) { |
| 2153 if (!render_process_host_mojo_) | 2152 if (!render_process_host_mojo_) |
| 2154 render_process_host_mojo_.reset(new RenderProcessHostMojoImpl(this)); | 2153 render_process_host_mojo_.reset(new RenderProcessHostMojoImpl(this)); |
| 2155 render_process_host_mojo_->SetWebUIHandle(view_routing_id, handle.Pass()); | 2154 render_process_host_mojo_->SetWebUIHandle(view_routing_id, handle.Pass()); |
| 2156 } | 2155 } |
| 2157 | 2156 |
| 2158 } // namespace content | 2157 } // namespace content |
| OLD | NEW |