| 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 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1632 switches::kCloudPrintURL, | 1632 switches::kCloudPrintURL, |
| 1633 switches::kCloudPrintXmppEndpoint, | 1633 switches::kCloudPrintXmppEndpoint, |
| 1634 switches::kDisableBundledPpapiFlash, | 1634 switches::kDisableBundledPpapiFlash, |
| 1635 switches::kDisableCastStreamingHWEncoding, | 1635 switches::kDisableCastStreamingHWEncoding, |
| 1636 switches::kDisableJavaScriptHarmonyShipping, | 1636 switches::kDisableJavaScriptHarmonyShipping, |
| 1637 switches::kDisableNewBookmarkApps, | 1637 switches::kDisableNewBookmarkApps, |
| 1638 #if defined(ENABLE_SPELLCHECK) && defined(OS_ANDROID) | 1638 #if defined(ENABLE_SPELLCHECK) && defined(OS_ANDROID) |
| 1639 switches::kEnableAndroidSpellChecker, | 1639 switches::kEnableAndroidSpellChecker, |
| 1640 #endif | 1640 #endif |
| 1641 switches::kEnableBenchmarking, | 1641 switches::kEnableBenchmarking, |
| 1642 switches::kEnableIgnition, |
| 1642 switches::kEnableNaCl, | 1643 switches::kEnableNaCl, |
| 1643 #if !defined(DISABLE_NACL) | 1644 #if !defined(DISABLE_NACL) |
| 1644 switches::kEnableNaClDebug, | 1645 switches::kEnableNaClDebug, |
| 1645 switches::kEnableNaClNonSfiMode, | 1646 switches::kEnableNaClNonSfiMode, |
| 1646 #endif | 1647 #endif |
| 1647 switches::kEnableNetBenchmarking, | 1648 switches::kEnableNetBenchmarking, |
| 1648 switches::kEnableNewBookmarkApps, | 1649 switches::kEnableNewBookmarkApps, |
| 1649 #if defined(OS_ANDROID) | 1650 #if defined(OS_ANDROID) |
| 1650 switches::kEnableOfflinePagesAsBookmarks, | 1651 switches::kEnableOfflinePagesAsBookmarks, |
| 1651 #endif | 1652 #endif |
| (...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2978 if (channel <= kMaxDisableEncryptionChannel) { | 2979 if (channel <= kMaxDisableEncryptionChannel) { |
| 2979 static const char* const kWebRtcDevSwitchNames[] = { | 2980 static const char* const kWebRtcDevSwitchNames[] = { |
| 2980 switches::kDisableWebRtcEncryption, | 2981 switches::kDisableWebRtcEncryption, |
| 2981 }; | 2982 }; |
| 2982 to_command_line->CopySwitchesFrom(from_command_line, | 2983 to_command_line->CopySwitchesFrom(from_command_line, |
| 2983 kWebRtcDevSwitchNames, | 2984 kWebRtcDevSwitchNames, |
| 2984 arraysize(kWebRtcDevSwitchNames)); | 2985 arraysize(kWebRtcDevSwitchNames)); |
| 2985 } | 2986 } |
| 2986 } | 2987 } |
| 2987 #endif // defined(ENABLE_WEBRTC) | 2988 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |