| 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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1485 #if !defined(DISABLE_NACL) | 1485 #if !defined(DISABLE_NACL) |
| 1486 switches::kEnableNaClDebug, | 1486 switches::kEnableNaClDebug, |
| 1487 switches::kEnableNaClNonSfiMode, | 1487 switches::kEnableNaClNonSfiMode, |
| 1488 #endif | 1488 #endif |
| 1489 switches::kEnableNetBenchmarking, | 1489 switches::kEnableNetBenchmarking, |
| 1490 switches::kEnableNewBookmarkApps, | 1490 switches::kEnableNewBookmarkApps, |
| 1491 switches::kEnableOutOfProcessPdf, | 1491 switches::kEnableOutOfProcessPdf, |
| 1492 switches::kEnablePluginPlaceholderShadowDom, | 1492 switches::kEnablePluginPlaceholderShadowDom, |
| 1493 switches::kJavaScriptHarmony, | 1493 switches::kJavaScriptHarmony, |
| 1494 switches::kMessageLoopHistogrammer, | 1494 switches::kMessageLoopHistogrammer, |
| 1495 switches::kPlaybackMode, | |
| 1496 switches::kPpapiFlashArgs, | 1495 switches::kPpapiFlashArgs, |
| 1497 switches::kPpapiFlashPath, | 1496 switches::kPpapiFlashPath, |
| 1498 switches::kPpapiFlashVersion, | 1497 switches::kPpapiFlashVersion, |
| 1499 switches::kProfilingAtStart, | 1498 switches::kProfilingAtStart, |
| 1500 switches::kProfilingFile, | 1499 switches::kProfilingFile, |
| 1501 switches::kProfilingFlush, | 1500 switches::kProfilingFlush, |
| 1502 switches::kRecordMode, | |
| 1503 translate::switches::kTranslateSecurityOrigin, | 1501 translate::switches::kTranslateSecurityOrigin, |
| 1504 }; | 1502 }; |
| 1505 | 1503 |
| 1506 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1504 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 1507 arraysize(kSwitchNames)); | 1505 arraysize(kSwitchNames)); |
| 1508 } else if (process_type == switches::kUtilityProcess) { | 1506 } else if (process_type == switches::kUtilityProcess) { |
| 1509 #if defined(ENABLE_EXTENSIONS) | 1507 #if defined(ENABLE_EXTENSIONS) |
| 1510 static const char* const kSwitchNames[] = { | 1508 static const char* const kSwitchNames[] = { |
| 1511 extensions::switches::kAllowHTTPBackgroundPage, | 1509 extensions::switches::kAllowHTTPBackgroundPage, |
| 1512 extensions::switches::kEnableExperimentalExtensionApis, | 1510 extensions::switches::kEnableExperimentalExtensionApis, |
| (...skipping 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2640 switches::kDisableWebRtcEncryption, | 2638 switches::kDisableWebRtcEncryption, |
| 2641 }; | 2639 }; |
| 2642 to_command_line->CopySwitchesFrom(from_command_line, | 2640 to_command_line->CopySwitchesFrom(from_command_line, |
| 2643 kWebRtcDevSwitchNames, | 2641 kWebRtcDevSwitchNames, |
| 2644 arraysize(kWebRtcDevSwitchNames)); | 2642 arraysize(kWebRtcDevSwitchNames)); |
| 2645 } | 2643 } |
| 2646 } | 2644 } |
| 2647 #endif // defined(ENABLE_WEBRTC) | 2645 #endif // defined(ENABLE_WEBRTC) |
| 2648 | 2646 |
| 2649 } // namespace chrome | 2647 } // namespace chrome |
| OLD | NEW |