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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 #include "chrome/installer/util/google_update_settings.h" | 101 #include "chrome/installer/util/google_update_settings.h" |
102 #include "chromeos/chromeos_constants.h" | 102 #include "chromeos/chromeos_constants.h" |
103 #include "components/autofill/core/common/autofill_switches.h" | 103 #include "components/autofill/core/common/autofill_switches.h" |
104 #include "components/cdm/browser/cdm_message_filter_android.h" | 104 #include "components/cdm/browser/cdm_message_filter_android.h" |
105 #include "components/cloud_devices/common/cloud_devices_switches.h" | 105 #include "components/cloud_devices/common/cloud_devices_switches.h" |
106 #include "components/content_settings/core/browser/content_settings_utils.h" | 106 #include "components/content_settings/core/browser/content_settings_utils.h" |
107 #include "components/content_settings/core/browser/cookie_settings.h" | 107 #include "components/content_settings/core/browser/cookie_settings.h" |
108 #include "components/content_settings/core/browser/host_content_settings_map.h" | 108 #include "components/content_settings/core/browser/host_content_settings_map.h" |
109 #include "components/content_settings/core/common/content_settings.h" | 109 #include "components/content_settings/core/common/content_settings.h" |
110 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" | 110 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" |
| 111 #include "components/dom_distiller/core/dom_distiller_switches.h" |
111 #include "components/dom_distiller/core/url_constants.h" | 112 #include "components/dom_distiller/core/url_constants.h" |
112 #include "components/google/core/browser/google_util.h" | 113 #include "components/google/core/browser/google_util.h" |
113 #include "components/metrics/client_info.h" | 114 #include "components/metrics/client_info.h" |
114 #include "components/net_log/chrome_net_log.h" | 115 #include "components/net_log/chrome_net_log.h" |
115 #include "components/pref_registry/pref_registry_syncable.h" | 116 #include "components/pref_registry/pref_registry_syncable.h" |
116 #include "components/rappor/rappor_utils.h" | 117 #include "components/rappor/rappor_utils.h" |
117 #include "components/signin/core/common/profile_management_switches.h" | 118 #include "components/signin/core/common/profile_management_switches.h" |
118 #include "components/translate/core/common/translate_switches.h" | 119 #include "components/translate/core/common/translate_switches.h" |
119 #include "components/url_formatter/url_fixer.h" | 120 #include "components/url_formatter/url_fixer.h" |
120 #include "components/variations/variations_associated_data.h" | 121 #include "components/variations/variations_associated_data.h" |
(...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1548 switches::kEnableNewBookmarkApps, | 1549 switches::kEnableNewBookmarkApps, |
1549 switches::kIsolateExtensions, | 1550 switches::kIsolateExtensions, |
1550 switches::kJavaScriptHarmony, | 1551 switches::kJavaScriptHarmony, |
1551 switches::kMessageLoopHistogrammer, | 1552 switches::kMessageLoopHistogrammer, |
1552 switches::kPpapiFlashArgs, | 1553 switches::kPpapiFlashArgs, |
1553 switches::kPpapiFlashPath, | 1554 switches::kPpapiFlashPath, |
1554 switches::kPpapiFlashVersion, | 1555 switches::kPpapiFlashVersion, |
1555 switches::kProfilingAtStart, | 1556 switches::kProfilingAtStart, |
1556 switches::kProfilingFile, | 1557 switches::kProfilingFile, |
1557 switches::kProfilingFlush, | 1558 switches::kProfilingFlush, |
| 1559 switches::kReaderModeHeuristics, |
1558 switches::kUnsafelyTreatInsecureOriginAsSecure, | 1560 switches::kUnsafelyTreatInsecureOriginAsSecure, |
1559 translate::switches::kTranslateSecurityOrigin, | 1561 translate::switches::kTranslateSecurityOrigin, |
1560 }; | 1562 }; |
1561 | 1563 |
1562 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1564 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1563 arraysize(kSwitchNames)); | 1565 arraysize(kSwitchNames)); |
1564 } else if (process_type == switches::kUtilityProcess) { | 1566 } else if (process_type == switches::kUtilityProcess) { |
1565 #if defined(ENABLE_EXTENSIONS) | 1567 #if defined(ENABLE_EXTENSIONS) |
1566 static const char* const kSwitchNames[] = { | 1568 static const char* const kSwitchNames[] = { |
1567 extensions::switches::kAllowHTTPBackgroundPage, | 1569 extensions::switches::kAllowHTTPBackgroundPage, |
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2714 if (channel <= kMaxDisableEncryptionChannel) { | 2716 if (channel <= kMaxDisableEncryptionChannel) { |
2715 static const char* const kWebRtcDevSwitchNames[] = { | 2717 static const char* const kWebRtcDevSwitchNames[] = { |
2716 switches::kDisableWebRtcEncryption, | 2718 switches::kDisableWebRtcEncryption, |
2717 }; | 2719 }; |
2718 to_command_line->CopySwitchesFrom(from_command_line, | 2720 to_command_line->CopySwitchesFrom(from_command_line, |
2719 kWebRtcDevSwitchNames, | 2721 kWebRtcDevSwitchNames, |
2720 arraysize(kWebRtcDevSwitchNames)); | 2722 arraysize(kWebRtcDevSwitchNames)); |
2721 } | 2723 } |
2722 } | 2724 } |
2723 #endif // defined(ENABLE_WEBRTC) | 2725 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |