| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 // any associated values) if present in the browser command line | 191 // any associated values) if present in the browser command line |
| 192 static const char* const kSwitchNames[] = { | 192 static const char* const kSwitchNames[] = { |
| 193 switches::kDisableBreakpad, | 193 switches::kDisableBreakpad, |
| 194 switches::kDisableDirectNPAPIRequests, | 194 switches::kDisableDirectNPAPIRequests, |
| 195 switches::kEnableStatsTable, | 195 switches::kEnableStatsTable, |
| 196 switches::kFullMemoryCrashReport, | 196 switches::kFullMemoryCrashReport, |
| 197 switches::kLoggingLevel, | 197 switches::kLoggingLevel, |
| 198 switches::kLogPluginMessages, | 198 switches::kLogPluginMessages, |
| 199 switches::kNoSandbox, | 199 switches::kNoSandbox, |
| 200 switches::kPluginStartupDialog, | 200 switches::kPluginStartupDialog, |
| 201 switches::kTestSandbox, | |
| 202 switches::kTraceStartup, | 201 switches::kTraceStartup, |
| 203 switches::kUseGL, | 202 switches::kUseGL, |
| 204 #if defined(OS_MACOSX) | 203 #if defined(OS_MACOSX) |
| 205 switches::kDisableCoreAnimationPlugins, | 204 switches::kDisableCoreAnimationPlugins, |
| 206 switches::kEnableSandboxLogging, | 205 switches::kEnableSandboxLogging, |
| 207 #endif | 206 #endif |
| 208 }; | 207 }; |
| 209 | 208 |
| 210 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 209 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 211 arraysize(kSwitchNames)); | 210 arraysize(kSwitchNames)); |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 | 417 |
| 419 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, | 418 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, |
| 420 ResourceContext** resource_context, | 419 ResourceContext** resource_context, |
| 421 net::URLRequestContext** request_context) { | 420 net::URLRequestContext** request_context) { |
| 422 *resource_context = | 421 *resource_context = |
| 423 resource_context_map_[request.origin_pid].resource_context; | 422 resource_context_map_[request.origin_pid].resource_context; |
| 424 *request_context = (*resource_context)->GetRequestContext(); | 423 *request_context = (*resource_context)->GetRequestContext(); |
| 425 } | 424 } |
| 426 | 425 |
| 427 } // namespace content | 426 } // namespace content |
| OLD | NEW |