| 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1594 switches::kEnableNaClNonSfiMode, | 1594 switches::kEnableNaClNonSfiMode, |
| 1595 #endif | 1595 #endif |
| 1596 switches::kEnableNetBenchmarking, | 1596 switches::kEnableNetBenchmarking, |
| 1597 switches::kEnableNewBookmarkApps, | 1597 switches::kEnableNewBookmarkApps, |
| 1598 switches::kEnableWasm, | 1598 switches::kEnableWasm, |
| 1599 #if !defined(DISABLE_NACL) | 1599 #if !defined(DISABLE_NACL) |
| 1600 switches::kForcePNaClSubzero, | 1600 switches::kForcePNaClSubzero, |
| 1601 #endif | 1601 #endif |
| 1602 switches::kJavaScriptHarmony, | 1602 switches::kJavaScriptHarmony, |
| 1603 switches::kMessageLoopHistogrammer, | 1603 switches::kMessageLoopHistogrammer, |
| 1604 switches::kOriginTrialDisabledFeatures, |
| 1604 switches::kOriginTrialPublicKey, | 1605 switches::kOriginTrialPublicKey, |
| 1605 switches::kPpapiFlashArgs, | 1606 switches::kPpapiFlashArgs, |
| 1606 switches::kPpapiFlashPath, | 1607 switches::kPpapiFlashPath, |
| 1607 switches::kPpapiFlashVersion, | 1608 switches::kPpapiFlashVersion, |
| 1608 switches::kProfilingAtStart, | 1609 switches::kProfilingAtStart, |
| 1609 switches::kProfilingFile, | 1610 switches::kProfilingFile, |
| 1610 switches::kProfilingFlush, | 1611 switches::kProfilingFlush, |
| 1611 switches::kReaderModeHeuristics, | 1612 switches::kReaderModeHeuristics, |
| 1612 switches::kUnsafelyTreatInsecureOriginAsSecure, | 1613 switches::kUnsafelyTreatInsecureOriginAsSecure, |
| 1613 translate::switches::kTranslateSecurityOrigin, | 1614 translate::switches::kTranslateSecurityOrigin, |
| (...skipping 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2958 if (channel <= kMaxDisableEncryptionChannel) { | 2959 if (channel <= kMaxDisableEncryptionChannel) { |
| 2959 static const char* const kWebRtcDevSwitchNames[] = { | 2960 static const char* const kWebRtcDevSwitchNames[] = { |
| 2960 switches::kDisableWebRtcEncryption, | 2961 switches::kDisableWebRtcEncryption, |
| 2961 }; | 2962 }; |
| 2962 to_command_line->CopySwitchesFrom(from_command_line, | 2963 to_command_line->CopySwitchesFrom(from_command_line, |
| 2963 kWebRtcDevSwitchNames, | 2964 kWebRtcDevSwitchNames, |
| 2964 arraysize(kWebRtcDevSwitchNames)); | 2965 arraysize(kWebRtcDevSwitchNames)); |
| 2965 } | 2966 } |
| 2966 } | 2967 } |
| 2967 #endif // defined(ENABLE_WEBRTC) | 2968 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |