| 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 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1669 #if !defined(DISABLE_NACL) | 1669 #if !defined(DISABLE_NACL) |
| 1670 switches::kEnableNaClDebug, | 1670 switches::kEnableNaClDebug, |
| 1671 switches::kEnableNaClNonSfiMode, | 1671 switches::kEnableNaClNonSfiMode, |
| 1672 #endif | 1672 #endif |
| 1673 switches::kEnableNetBenchmarking, | 1673 switches::kEnableNetBenchmarking, |
| 1674 switches::kEnableNewBookmarkApps, | 1674 switches::kEnableNewBookmarkApps, |
| 1675 #if !defined(DISABLE_NACL) | 1675 #if !defined(DISABLE_NACL) |
| 1676 switches::kForcePNaClSubzero, | 1676 switches::kForcePNaClSubzero, |
| 1677 #endif | 1677 #endif |
| 1678 switches::kJavaScriptHarmony, | 1678 switches::kJavaScriptHarmony, |
| 1679 switches::kMessageLoopHistogrammer, | |
| 1680 switches::kOriginTrialDisabledFeatures, | 1679 switches::kOriginTrialDisabledFeatures, |
| 1681 switches::kOriginTrialPublicKey, | 1680 switches::kOriginTrialPublicKey, |
| 1682 switches::kPpapiFlashArgs, | 1681 switches::kPpapiFlashArgs, |
| 1683 switches::kPpapiFlashPath, | 1682 switches::kPpapiFlashPath, |
| 1684 switches::kPpapiFlashVersion, | 1683 switches::kPpapiFlashVersion, |
| 1685 switches::kProfilingAtStart, | 1684 switches::kProfilingAtStart, |
| 1686 switches::kProfilingFile, | 1685 switches::kProfilingFile, |
| 1687 switches::kProfilingFlush, | 1686 switches::kProfilingFlush, |
| 1688 switches::kReaderModeHeuristics, | 1687 switches::kReaderModeHeuristics, |
| 1689 switches::kUnsafelyTreatInsecureOriginAsSecure, | 1688 switches::kUnsafelyTreatInsecureOriginAsSecure, |
| (...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3234 if (channel <= kMaxDisableEncryptionChannel) { | 3233 if (channel <= kMaxDisableEncryptionChannel) { |
| 3235 static const char* const kWebRtcDevSwitchNames[] = { | 3234 static const char* const kWebRtcDevSwitchNames[] = { |
| 3236 switches::kDisableWebRtcEncryption, | 3235 switches::kDisableWebRtcEncryption, |
| 3237 }; | 3236 }; |
| 3238 to_command_line->CopySwitchesFrom(from_command_line, | 3237 to_command_line->CopySwitchesFrom(from_command_line, |
| 3239 kWebRtcDevSwitchNames, | 3238 kWebRtcDevSwitchNames, |
| 3240 arraysize(kWebRtcDevSwitchNames)); | 3239 arraysize(kWebRtcDevSwitchNames)); |
| 3241 } | 3240 } |
| 3242 } | 3241 } |
| 3243 #endif // defined(ENABLE_WEBRTC) | 3242 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |