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 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1458 switches::kDisableJavaScriptHarmonyShipping, | 1458 switches::kDisableJavaScriptHarmonyShipping, |
1459 switches::kDisableNewBookmarkApps, | 1459 switches::kDisableNewBookmarkApps, |
1460 switches::kDisableOutOfProcessPdf, | 1460 switches::kDisableOutOfProcessPdf, |
1461 switches::kEnableBenchmarking, | 1461 switches::kEnableBenchmarking, |
1462 switches::kEnableNaCl, | 1462 switches::kEnableNaCl, |
1463 #if !defined(DISABLE_NACL) | 1463 #if !defined(DISABLE_NACL) |
1464 switches::kEnableNaClDebug, | 1464 switches::kEnableNaClDebug, |
1465 switches::kEnableNaClNonSfiMode, | 1465 switches::kEnableNaClNonSfiMode, |
1466 #endif | 1466 #endif |
1467 switches::kEnableNetBenchmarking, | 1467 switches::kEnableNetBenchmarking, |
| 1468 switches::kEnableNewBookmarkApps, |
1468 switches::kEnableOutOfProcessPdf, | 1469 switches::kEnableOutOfProcessPdf, |
1469 switches::kEnablePluginPlaceholderShadowDom, | 1470 switches::kEnablePluginPlaceholderShadowDom, |
1470 switches::kEnableShowModalDialog, | 1471 switches::kEnableShowModalDialog, |
1471 switches::kEnableWebBasedSignin, | 1472 switches::kEnableWebBasedSignin, |
1472 switches::kJavaScriptHarmony, | 1473 switches::kJavaScriptHarmony, |
1473 switches::kMessageLoopHistogrammer, | 1474 switches::kMessageLoopHistogrammer, |
1474 switches::kPlaybackMode, | 1475 switches::kPlaybackMode, |
1475 switches::kPpapiFlashArgs, | 1476 switches::kPpapiFlashArgs, |
1476 switches::kPpapiFlashPath, | 1477 switches::kPpapiFlashPath, |
1477 switches::kPpapiFlashVersion, | 1478 switches::kPpapiFlashVersion, |
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2634 switches::kDisableWebRtcEncryption, | 2635 switches::kDisableWebRtcEncryption, |
2635 }; | 2636 }; |
2636 to_command_line->CopySwitchesFrom(from_command_line, | 2637 to_command_line->CopySwitchesFrom(from_command_line, |
2637 kWebRtcDevSwitchNames, | 2638 kWebRtcDevSwitchNames, |
2638 arraysize(kWebRtcDevSwitchNames)); | 2639 arraysize(kWebRtcDevSwitchNames)); |
2639 } | 2640 } |
2640 } | 2641 } |
2641 #endif // defined(ENABLE_WEBRTC) | 2642 #endif // defined(ENABLE_WEBRTC) |
2642 | 2643 |
2643 } // namespace chrome | 2644 } // namespace chrome |
OLD | NEW |