| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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) && !defined(USE_AURA) | 7 #if defined(OS_WIN) && !defined(USE_AURA) |
| 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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 CommandLine* cmd_line = new CommandLine(exe_path); | 194 CommandLine* cmd_line = new CommandLine(exe_path); |
| 195 // Put the process type and plugin path first so they're easier to see | 195 // Put the process type and plugin path first so they're easier to see |
| 196 // in process listings using native process management tools. | 196 // in process listings using native process management tools. |
| 197 cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kPluginProcess); | 197 cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kPluginProcess); |
| 198 cmd_line->AppendSwitchPath(switches::kPluginPath, info.path); | 198 cmd_line->AppendSwitchPath(switches::kPluginPath, info.path); |
| 199 | 199 |
| 200 // Propagate the following switches to the plugin command line (along with | 200 // Propagate the following switches to the plugin command line (along with |
| 201 // any associated values) if present in the browser command line | 201 // any associated values) if present in the browser command line |
| 202 static const char* const kSwitchNames[] = { | 202 static const char* const kSwitchNames[] = { |
| 203 switches::kDisableBreakpad, | 203 switches::kDisableBreakpad, |
| 204 #if defined(OS_MACOSX) |
| 205 switches::kDisableCompositedCoreAnimationPlugins, |
| 206 #endif |
| 204 switches::kDisableLogging, | 207 switches::kDisableLogging, |
| 205 switches::kEnableDCHECK, | 208 switches::kEnableDCHECK, |
| 206 switches::kEnableLogging, | 209 switches::kEnableLogging, |
| 207 switches::kEnableStatsTable, | 210 switches::kEnableStatsTable, |
| 208 switches::kFullMemoryCrashReport, | 211 switches::kFullMemoryCrashReport, |
| 209 switches::kLoggingLevel, | 212 switches::kLoggingLevel, |
| 210 switches::kLogPluginMessages, | 213 switches::kLogPluginMessages, |
| 211 switches::kNoSandbox, | 214 switches::kNoSandbox, |
| 212 switches::kPluginStartupDialog, | 215 switches::kPluginStartupDialog, |
| 213 switches::kTestSandbox, | 216 switches::kTestSandbox, |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 } | 416 } |
| 414 | 417 |
| 415 void PluginProcessHost::OnChannelCreated( | 418 void PluginProcessHost::OnChannelCreated( |
| 416 const IPC::ChannelHandle& channel_handle) { | 419 const IPC::ChannelHandle& channel_handle) { |
| 417 Client* client = sent_requests_.front(); | 420 Client* client = sent_requests_.front(); |
| 418 | 421 |
| 419 if (client) | 422 if (client) |
| 420 client->OnChannelOpened(channel_handle); | 423 client->OnChannelOpened(channel_handle); |
| 421 sent_requests_.pop_front(); | 424 sent_requests_.pop_front(); |
| 422 } | 425 } |
| OLD | NEW |