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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 // any associated values) if present in the browser command line | 219 // any associated values) if present in the browser command line |
220 static const char* const kSwitchNames[] = { | 220 static const char* const kSwitchNames[] = { |
221 switches::kDisableBreakpad, | 221 switches::kDisableBreakpad, |
222 #if defined(OS_MACOSX) | 222 #if defined(OS_MACOSX) |
223 switches::kDisableCompositedCoreAnimationPlugins, | 223 switches::kDisableCompositedCoreAnimationPlugins, |
224 switches::kDisableCoreAnimationPlugins, | 224 switches::kDisableCoreAnimationPlugins, |
225 #endif | 225 #endif |
226 switches::kDisableLogging, | 226 switches::kDisableLogging, |
227 switches::kEnableDCHECK, | 227 switches::kEnableDCHECK, |
228 switches::kEnableLogging, | 228 switches::kEnableLogging, |
| 229 #if defined(OS_MACOSX) |
| 230 switches::kEnableSandboxLogging, |
| 231 #endif |
229 switches::kEnableStatsTable, | 232 switches::kEnableStatsTable, |
230 switches::kFullMemoryCrashReport, | 233 switches::kFullMemoryCrashReport, |
231 switches::kLoggingLevel, | 234 switches::kLoggingLevel, |
232 switches::kLogPluginMessages, | 235 switches::kLogPluginMessages, |
233 switches::kNoSandbox, | 236 switches::kNoSandbox, |
234 switches::kPluginStartupDialog, | 237 switches::kPluginStartupDialog, |
235 switches::kTestSandbox, | 238 switches::kTestSandbox, |
236 switches::kTraceStartup, | 239 switches::kTraceStartup, |
237 switches::kUseGL, | 240 switches::kUseGL, |
238 switches::kUserAgent, | 241 switches::kUserAgent, |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 } | 450 } |
448 | 451 |
449 void PluginProcessHost::OnChannelCreated( | 452 void PluginProcessHost::OnChannelCreated( |
450 const IPC::ChannelHandle& channel_handle) { | 453 const IPC::ChannelHandle& channel_handle) { |
451 Client* client = sent_requests_.front(); | 454 Client* client = sent_requests_.front(); |
452 | 455 |
453 if (client) | 456 if (client) |
454 client->OnChannelOpened(channel_handle); | 457 client->OnChannelOpened(channel_handle); |
455 sent_requests_.pop_front(); | 458 sent_requests_.pop_front(); |
456 } | 459 } |
OLD | NEW |