| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 #include "components/error_page/common/error_page_switches.h" | 127 #include "components/error_page/common/error_page_switches.h" |
| 128 #include "components/google/core/browser/google_util.h" | 128 #include "components/google/core/browser/google_util.h" |
| 129 #include "components/metrics/client_info.h" | 129 #include "components/metrics/client_info.h" |
| 130 #include "components/net_log/chrome_net_log.h" | 130 #include "components/net_log/chrome_net_log.h" |
| 131 #include "components/pref_registry/pref_registry_syncable.h" | 131 #include "components/pref_registry/pref_registry_syncable.h" |
| 132 #include "components/prefs/pref_service.h" | 132 #include "components/prefs/pref_service.h" |
| 133 #include "components/prefs/scoped_user_pref_update.h" | 133 #include "components/prefs/scoped_user_pref_update.h" |
| 134 #include "components/rappor/rappor_utils.h" | 134 #include "components/rappor/rappor_utils.h" |
| 135 #include "components/security_interstitials/core/ssl_error_ui.h" | 135 #include "components/security_interstitials/core/ssl_error_ui.h" |
| 136 #include "components/signin/core/common/profile_management_switches.h" | 136 #include "components/signin/core/common/profile_management_switches.h" |
| 137 #include "components/spellcheck/common/spellcheck_switches.h" | |
| 138 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" | 137 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" |
| 139 #include "components/subresource_filter/content/browser/content_subresource_filt
er_driver_factory.h" | 138 #include "components/subresource_filter/content/browser/content_subresource_filt
er_driver_factory.h" |
| 140 #include "components/subresource_filter/content/browser/subresource_filter_navig
ation_throttle.h" | 139 #include "components/subresource_filter/content/browser/subresource_filter_navig
ation_throttle.h" |
| 141 #include "components/translate/core/common/translate_switches.h" | 140 #include "components/translate/core/common/translate_switches.h" |
| 142 #include "components/url_formatter/url_fixer.h" | 141 #include "components/url_formatter/url_fixer.h" |
| 143 #include "components/variations/variations_associated_data.h" | 142 #include "components/variations/variations_associated_data.h" |
| 144 #include "components/version_info/version_info.h" | 143 #include "components/version_info/version_info.h" |
| 145 #include "content/public/browser/browser_child_process_host.h" | 144 #include "content/public/browser/browser_child_process_host.h" |
| 146 #include "content/public/browser/browser_main_parts.h" | 145 #include "content/public/browser/browser_main_parts.h" |
| 147 #include "content/public/browser/browser_ppapi_host.h" | 146 #include "content/public/browser/browser_ppapi_host.h" |
| (...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1635 extensions::switches::kWhitelistedExtensionID, | 1634 extensions::switches::kWhitelistedExtensionID, |
| 1636 #endif | 1635 #endif |
| 1637 switches::kAllowInsecureLocalhost, | 1636 switches::kAllowInsecureLocalhost, |
| 1638 switches::kAppsGalleryURL, | 1637 switches::kAppsGalleryURL, |
| 1639 switches::kCloudPrintURL, | 1638 switches::kCloudPrintURL, |
| 1640 switches::kCloudPrintXmppEndpoint, | 1639 switches::kCloudPrintXmppEndpoint, |
| 1641 switches::kDisableBundledPpapiFlash, | 1640 switches::kDisableBundledPpapiFlash, |
| 1642 switches::kDisableCastStreamingHWEncoding, | 1641 switches::kDisableCastStreamingHWEncoding, |
| 1643 switches::kDisableJavaScriptHarmonyShipping, | 1642 switches::kDisableJavaScriptHarmonyShipping, |
| 1644 switches::kDisableNewBookmarkApps, | 1643 switches::kDisableNewBookmarkApps, |
| 1645 #if defined(ENABLE_SPELLCHECK) && defined(OS_ANDROID) | |
| 1646 spellcheck::switches::kEnableAndroidSpellChecker, | |
| 1647 #endif | |
| 1648 switches::kEnableBenchmarking, | 1644 switches::kEnableBenchmarking, |
| 1649 switches::kEnableNaCl, | 1645 switches::kEnableNaCl, |
| 1650 #if !defined(DISABLE_NACL) | 1646 #if !defined(DISABLE_NACL) |
| 1651 switches::kEnableNaClDebug, | 1647 switches::kEnableNaClDebug, |
| 1652 switches::kEnableNaClNonSfiMode, | 1648 switches::kEnableNaClNonSfiMode, |
| 1653 #endif | 1649 #endif |
| 1654 switches::kEnableNetBenchmarking, | 1650 switches::kEnableNetBenchmarking, |
| 1655 switches::kEnableNewBookmarkApps, | 1651 switches::kEnableNewBookmarkApps, |
| 1656 #if !defined(DISABLE_NACL) | 1652 #if !defined(DISABLE_NACL) |
| 1657 switches::kForcePNaClSubzero, | 1653 switches::kForcePNaClSubzero, |
| (...skipping 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3154 if (channel <= kMaxDisableEncryptionChannel) { | 3150 if (channel <= kMaxDisableEncryptionChannel) { |
| 3155 static const char* const kWebRtcDevSwitchNames[] = { | 3151 static const char* const kWebRtcDevSwitchNames[] = { |
| 3156 switches::kDisableWebRtcEncryption, | 3152 switches::kDisableWebRtcEncryption, |
| 3157 }; | 3153 }; |
| 3158 to_command_line->CopySwitchesFrom(from_command_line, | 3154 to_command_line->CopySwitchesFrom(from_command_line, |
| 3159 kWebRtcDevSwitchNames, | 3155 kWebRtcDevSwitchNames, |
| 3160 arraysize(kWebRtcDevSwitchNames)); | 3156 arraysize(kWebRtcDevSwitchNames)); |
| 3161 } | 3157 } |
| 3162 } | 3158 } |
| 3163 #endif // defined(ENABLE_WEBRTC) | 3159 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |