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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
102 #include "chrome/installer/util/google_update_settings.h" | 102 #include "chrome/installer/util/google_update_settings.h" |
103 #include "chromeos/chromeos_constants.h" | 103 #include "chromeos/chromeos_constants.h" |
104 #include "components/autofill/core/common/autofill_switches.h" | 104 #include "components/autofill/core/common/autofill_switches.h" |
105 #include "components/cdm/browser/cdm_message_filter_android.h" | 105 #include "components/cdm/browser/cdm_message_filter_android.h" |
106 #include "components/cloud_devices/common/cloud_devices_switches.h" | 106 #include "components/cloud_devices/common/cloud_devices_switches.h" |
107 #include "components/content_settings/core/browser/content_settings_utils.h" | 107 #include "components/content_settings/core/browser/content_settings_utils.h" |
108 #include "components/content_settings/core/browser/cookie_settings.h" | 108 #include "components/content_settings/core/browser/cookie_settings.h" |
109 #include "components/content_settings/core/browser/host_content_settings_map.h" | 109 #include "components/content_settings/core/browser/host_content_settings_map.h" |
110 #include "components/content_settings/core/common/content_settings.h" | 110 #include "components/content_settings/core/common/content_settings.h" |
111 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h" | 111 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h" |
112 #include "components/dom_distiller/core/dom_distiller_switches.h" | |
112 #include "components/dom_distiller/core/url_constants.h" | 113 #include "components/dom_distiller/core/url_constants.h" |
113 #include "components/google/core/browser/google_util.h" | 114 #include "components/google/core/browser/google_util.h" |
114 #include "components/metrics/client_info.h" | 115 #include "components/metrics/client_info.h" |
115 #include "components/net_log/chrome_net_log.h" | 116 #include "components/net_log/chrome_net_log.h" |
116 #include "components/pref_registry/pref_registry_syncable.h" | 117 #include "components/pref_registry/pref_registry_syncable.h" |
117 #include "components/rappor/rappor_utils.h" | 118 #include "components/rappor/rappor_utils.h" |
118 #include "components/signin/core/common/profile_management_switches.h" | 119 #include "components/signin/core/common/profile_management_switches.h" |
119 #include "components/translate/core/common/translate_switches.h" | 120 #include "components/translate/core/common/translate_switches.h" |
120 #include "components/url_formatter/url_fixer.h" | 121 #include "components/url_formatter/url_fixer.h" |
121 #include "components/variations/variations_associated_data.h" | 122 #include "components/variations/variations_associated_data.h" |
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1573 switches::kEnableNewBookmarkApps, | 1574 switches::kEnableNewBookmarkApps, |
1574 switches::kIsolateExtensions, | 1575 switches::kIsolateExtensions, |
1575 switches::kJavaScriptHarmony, | 1576 switches::kJavaScriptHarmony, |
1576 switches::kMessageLoopHistogrammer, | 1577 switches::kMessageLoopHistogrammer, |
1577 switches::kPpapiFlashArgs, | 1578 switches::kPpapiFlashArgs, |
1578 switches::kPpapiFlashPath, | 1579 switches::kPpapiFlashPath, |
1579 switches::kPpapiFlashVersion, | 1580 switches::kPpapiFlashVersion, |
1580 switches::kProfilingAtStart, | 1581 switches::kProfilingAtStart, |
1581 switches::kProfilingFile, | 1582 switches::kProfilingFile, |
1582 switches::kProfilingFlush, | 1583 switches::kProfilingFlush, |
1584 switches::kReaderModeHeuristics, | |
Lei Zhang
2015/11/12 22:51:37
You are forwarding this switch to renderers, but i
wychen
2015/11/12 23:07:03
I guess this conceptually belongs to the CL this d
| |
1583 switches::kUnsafelyTreatInsecureOriginAsSecure, | 1585 switches::kUnsafelyTreatInsecureOriginAsSecure, |
1584 translate::switches::kTranslateSecurityOrigin, | 1586 translate::switches::kTranslateSecurityOrigin, |
1585 }; | 1587 }; |
1586 | 1588 |
1587 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1589 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1588 arraysize(kSwitchNames)); | 1590 arraysize(kSwitchNames)); |
1589 } else if (process_type == switches::kUtilityProcess) { | 1591 } else if (process_type == switches::kUtilityProcess) { |
1590 #if defined(ENABLE_EXTENSIONS) | 1592 #if defined(ENABLE_EXTENSIONS) |
1591 static const char* const kSwitchNames[] = { | 1593 static const char* const kSwitchNames[] = { |
1592 extensions::switches::kAllowHTTPBackgroundPage, | 1594 extensions::switches::kAllowHTTPBackgroundPage, |
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2769 if (channel <= kMaxDisableEncryptionChannel) { | 2771 if (channel <= kMaxDisableEncryptionChannel) { |
2770 static const char* const kWebRtcDevSwitchNames[] = { | 2772 static const char* const kWebRtcDevSwitchNames[] = { |
2771 switches::kDisableWebRtcEncryption, | 2773 switches::kDisableWebRtcEncryption, |
2772 }; | 2774 }; |
2773 to_command_line->CopySwitchesFrom(from_command_line, | 2775 to_command_line->CopySwitchesFrom(from_command_line, |
2774 kWebRtcDevSwitchNames, | 2776 kWebRtcDevSwitchNames, |
2775 arraysize(kWebRtcDevSwitchNames)); | 2777 arraysize(kWebRtcDevSwitchNames)); |
2776 } | 2778 } |
2777 } | 2779 } |
2778 #endif // defined(ENABLE_WEBRTC) | 2780 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |