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 1594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1605 command_line->AppendSwitchASCII( | 1605 command_line->AppendSwitchASCII( |
1606 error_page::switches::kShowSavedCopy, | 1606 error_page::switches::kShowSavedCopy, |
1607 error_page::switches::kEnableShowSavedCopySecondary); | 1607 error_page::switches::kEnableShowSavedCopySecondary); |
1608 } | 1608 } |
1609 } | 1609 } |
1610 } | 1610 } |
1611 | 1611 |
1612 MaybeAppendBlinkSettingsSwitchForFieldTrial( | 1612 MaybeAppendBlinkSettingsSwitchForFieldTrial( |
1613 browser_command_line, command_line); | 1613 browser_command_line, command_line); |
1614 | 1614 |
| 1615 #if defined(OS_ANDROID) |
| 1616 // If the platform is Android, force the distillability service on. |
| 1617 command_line->AppendSwitch(switches::kEnableDistillabilityService); |
| 1618 #endif |
| 1619 |
1615 // Please keep this in alphabetical order. | 1620 // Please keep this in alphabetical order. |
1616 static const char* const kSwitchNames[] = { | 1621 static const char* const kSwitchNames[] = { |
1617 #if defined(OS_ANDROID) | 1622 #if defined(OS_ANDROID) |
1618 autofill::switches::kDisableAccessorySuggestionView, | 1623 autofill::switches::kDisableAccessorySuggestionView, |
1619 autofill::switches::kEnableAccessorySuggestionView, | 1624 autofill::switches::kEnableAccessorySuggestionView, |
1620 #endif | 1625 #endif |
1621 autofill::switches::kDisablePasswordGeneration, | 1626 autofill::switches::kDisablePasswordGeneration, |
1622 autofill::switches::kEnablePasswordGeneration, | 1627 autofill::switches::kEnablePasswordGeneration, |
1623 autofill::switches::kEnableSingleClickAutofill, | 1628 autofill::switches::kEnableSingleClickAutofill, |
1624 autofill::switches::kEnableSuggestionsWithSubstringMatch, | 1629 autofill::switches::kEnableSuggestionsWithSubstringMatch, |
(...skipping 11 matching lines...) Expand all Loading... |
1636 #endif | 1641 #endif |
1637 switches::kAllowInsecureLocalhost, | 1642 switches::kAllowInsecureLocalhost, |
1638 switches::kAppsGalleryURL, | 1643 switches::kAppsGalleryURL, |
1639 switches::kCloudPrintURL, | 1644 switches::kCloudPrintURL, |
1640 switches::kCloudPrintXmppEndpoint, | 1645 switches::kCloudPrintXmppEndpoint, |
1641 switches::kDisableBundledPpapiFlash, | 1646 switches::kDisableBundledPpapiFlash, |
1642 switches::kDisableCastStreamingHWEncoding, | 1647 switches::kDisableCastStreamingHWEncoding, |
1643 switches::kDisableJavaScriptHarmonyShipping, | 1648 switches::kDisableJavaScriptHarmonyShipping, |
1644 switches::kDisableNewBookmarkApps, | 1649 switches::kDisableNewBookmarkApps, |
1645 switches::kEnableBenchmarking, | 1650 switches::kEnableBenchmarking, |
| 1651 switches::kEnableDistillabilityService, |
1646 switches::kEnableNaCl, | 1652 switches::kEnableNaCl, |
1647 #if !defined(DISABLE_NACL) | 1653 #if !defined(DISABLE_NACL) |
1648 switches::kEnableNaClDebug, | 1654 switches::kEnableNaClDebug, |
1649 switches::kEnableNaClNonSfiMode, | 1655 switches::kEnableNaClNonSfiMode, |
1650 #endif | 1656 #endif |
1651 switches::kEnableNetBenchmarking, | 1657 switches::kEnableNetBenchmarking, |
1652 switches::kEnableNewBookmarkApps, | 1658 switches::kEnableNewBookmarkApps, |
1653 #if !defined(DISABLE_NACL) | 1659 #if !defined(DISABLE_NACL) |
1654 switches::kForcePNaClSubzero, | 1660 switches::kForcePNaClSubzero, |
1655 #endif | 1661 #endif |
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3179 if (channel <= kMaxDisableEncryptionChannel) { | 3185 if (channel <= kMaxDisableEncryptionChannel) { |
3180 static const char* const kWebRtcDevSwitchNames[] = { | 3186 static const char* const kWebRtcDevSwitchNames[] = { |
3181 switches::kDisableWebRtcEncryption, | 3187 switches::kDisableWebRtcEncryption, |
3182 }; | 3188 }; |
3183 to_command_line->CopySwitchesFrom(from_command_line, | 3189 to_command_line->CopySwitchesFrom(from_command_line, |
3184 kWebRtcDevSwitchNames, | 3190 kWebRtcDevSwitchNames, |
3185 arraysize(kWebRtcDevSwitchNames)); | 3191 arraysize(kWebRtcDevSwitchNames)); |
3186 } | 3192 } |
3187 } | 3193 } |
3188 #endif // defined(ENABLE_WEBRTC) | 3194 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |