| 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 #include "content/browser/plugin_process_host.h" | 5 #include "content/browser/plugin_process_host.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #elif defined(OS_POSIX) | 9 #elif defined(OS_POSIX) |
| 10 #include <utility> // for pair<> | 10 #include <utility> // for pair<> |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 switches::kLogPluginMessages, | 212 switches::kLogPluginMessages, |
| 213 switches::kNoSandbox, | 213 switches::kNoSandbox, |
| 214 switches::kPluginStartupDialog, | 214 switches::kPluginStartupDialog, |
| 215 switches::kTestSandbox, | 215 switches::kTestSandbox, |
| 216 switches::kTraceStartup, | 216 switches::kTraceStartup, |
| 217 switches::kUseGL, | 217 switches::kUseGL, |
| 218 #if defined(OS_MACOSX) | 218 #if defined(OS_MACOSX) |
| 219 switches::kDisableCoreAnimationPlugins, | 219 switches::kDisableCoreAnimationPlugins, |
| 220 switches::kEnableSandboxLogging, | 220 switches::kEnableSandboxLogging, |
| 221 #endif | 221 #endif |
| 222 #if defined(OS_WIN) | |
| 223 switches::kHighDPISupport, | |
| 224 #endif | |
| 225 }; | 222 }; |
| 226 | 223 |
| 227 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 224 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 228 arraysize(kSwitchNames)); | 225 arraysize(kSwitchNames)); |
| 229 | 226 |
| 230 GpuDataManagerImpl::GetInstance()->AppendPluginCommandLine(cmd_line); | 227 GpuDataManagerImpl::GetInstance()->AppendPluginCommandLine(cmd_line); |
| 231 | 228 |
| 232 // If specified, prepend a launcher program to the command line. | 229 // If specified, prepend a launcher program to the command line. |
| 233 if (!plugin_launcher.empty()) | 230 if (!plugin_launcher.empty()) |
| 234 cmd_line->PrependWrapper(plugin_launcher); | 231 cmd_line->PrependWrapper(plugin_launcher); |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 | 436 |
| 440 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, | 437 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, |
| 441 ResourceContext** resource_context, | 438 ResourceContext** resource_context, |
| 442 net::URLRequestContext** request_context) { | 439 net::URLRequestContext** request_context) { |
| 443 *resource_context = | 440 *resource_context = |
| 444 resource_context_map_[request.origin_pid].resource_context; | 441 resource_context_map_[request.origin_pid].resource_context; |
| 445 *request_context = (*resource_context)->GetRequestContext(); | 442 *request_context = (*resource_context)->GetRequestContext(); |
| 446 } | 443 } |
| 447 | 444 |
| 448 } // namespace content | 445 } // namespace content |
| OLD | NEW |