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 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1189 switches::kNetworkCountryIso, | 1189 switches::kNetworkCountryIso, |
1190 switches::kDisableWebAudio, | 1190 switches::kDisableWebAudio, |
1191 #endif | 1191 #endif |
1192 #if defined(OS_MACOSX) | 1192 #if defined(OS_MACOSX) |
1193 // Allow this to be set when invoking the browser and relayed along. | 1193 // Allow this to be set when invoking the browser and relayed along. |
1194 switches::kEnableSandboxLogging, | 1194 switches::kEnableSandboxLogging, |
1195 #endif | 1195 #endif |
1196 #if defined(OS_WIN) | 1196 #if defined(OS_WIN) |
1197 switches::kEnableDirectWrite, | 1197 switches::kEnableDirectWrite, |
1198 switches::kEnableHighResolutionTime, | 1198 switches::kEnableHighResolutionTime, |
1199 switches::kHighDPISupport, | |
1200 #endif | 1199 #endif |
1201 }; | 1200 }; |
1202 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, | 1201 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, |
1203 arraysize(kSwitchNames)); | 1202 arraysize(kSwitchNames)); |
1204 | 1203 |
1205 if (browser_cmd.HasSwitch(switches::kTraceStartup) && | 1204 if (browser_cmd.HasSwitch(switches::kTraceStartup) && |
1206 BrowserMainLoop::GetInstance()->is_tracing_startup()) { | 1205 BrowserMainLoop::GetInstance()->is_tracing_startup()) { |
1207 // Pass kTraceStartup switch to renderer only if startup tracing has not | 1206 // Pass kTraceStartup switch to renderer only if startup tracing has not |
1208 // finished. | 1207 // finished. |
1209 renderer_cmd->AppendSwitchASCII( | 1208 renderer_cmd->AppendSwitchASCII( |
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2075 mojo::ScopedMessagePipeHandle handle) { | 2074 mojo::ScopedMessagePipeHandle handle) { |
2076 mojo_activation_required_ = true; | 2075 mojo_activation_required_ = true; |
2077 MaybeActivateMojo(); | 2076 MaybeActivateMojo(); |
2078 | 2077 |
2079 mojo::AllocationScope scope; | 2078 mojo::AllocationScope scope; |
2080 mojo_application_host_->shell_client()->AcceptConnection(service_name, | 2079 mojo_application_host_->shell_client()->AcceptConnection(service_name, |
2081 handle.Pass()); | 2080 handle.Pass()); |
2082 } | 2081 } |
2083 | 2082 |
2084 } // namespace content | 2083 } // namespace content |
OLD | NEW |