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 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1194 switches::kDisableWebAudio, | 1194 switches::kDisableWebAudio, |
1195 #endif | 1195 #endif |
1196 #if defined(OS_MACOSX) | 1196 #if defined(OS_MACOSX) |
1197 // Allow this to be set when invoking the browser and relayed along. | 1197 // Allow this to be set when invoking the browser and relayed along. |
1198 switches::kEnableSandboxLogging, | 1198 switches::kEnableSandboxLogging, |
1199 #endif | 1199 #endif |
1200 #if defined(OS_WIN) | 1200 #if defined(OS_WIN) |
1201 switches::kEnableDirectWrite, | 1201 switches::kEnableDirectWrite, |
1202 switches::kEnableHighResolutionTime, | 1202 switches::kEnableHighResolutionTime, |
1203 switches::kHighDPISupport, | 1203 switches::kHighDPISupport, |
| 1204 switches::kRegisterFontFiles, |
1204 #endif | 1205 #endif |
1205 }; | 1206 }; |
1206 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1207 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
1207 arraysize(kSwitchNames)); | 1208 arraysize(kSwitchNames)); |
1208 | 1209 |
1209 if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1210 if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
1210 BrowserMainLoop::GetInstance()->is_tracing_startup()) { | 1211 BrowserMainLoop::GetInstance()->is_tracing_startup()) { |
1211 // Pass kTraceStartup switch to renderer only if startup tracing has not | 1212 // Pass kTraceStartup switch to renderer only if startup tracing has not |
1212 // finished. | 1213 // finished. |
1213 renderer_cmd->AppendSwitchASCII( | 1214 renderer_cmd->AppendSwitchASCII( |
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2139 | 2140 |
2140 void RenderProcessHostImpl::SetWebUIHandle( | 2141 void RenderProcessHostImpl::SetWebUIHandle( |
2141 int32 view_routing_id, | 2142 int32 view_routing_id, |
2142 mojo::ScopedMessagePipeHandle handle) { | 2143 mojo::ScopedMessagePipeHandle handle) { |
2143 if (!render_process_host_mojo_) | 2144 if (!render_process_host_mojo_) |
2144 render_process_host_mojo_.reset(new RenderProcessHostMojoImpl(this)); | 2145 render_process_host_mojo_.reset(new RenderProcessHostMojoImpl(this)); |
2145 render_process_host_mojo_->SetWebUIHandle(view_routing_id, handle.Pass()); | 2146 render_process_host_mojo_->SetWebUIHandle(view_routing_id, handle.Pass()); |
2146 } | 2147 } |
2147 | 2148 |
2148 } // namespace content | 2149 } // namespace content |
OLD | NEW |