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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 #include "components/cdm/browser/cdm_message_filter_android.h" | 90 #include "components/cdm/browser/cdm_message_filter_android.h" |
91 #include "components/cloud_devices/common/cloud_devices_switches.h" | 91 #include "components/cloud_devices/common/cloud_devices_switches.h" |
92 #include "components/content_settings/core/browser/content_settings_utils.h" | 92 #include "components/content_settings/core/browser/content_settings_utils.h" |
93 #include "components/content_settings/core/browser/host_content_settings_map.h" | 93 #include "components/content_settings/core/browser/host_content_settings_map.h" |
94 #include "components/content_settings/core/common/content_settings.h" | 94 #include "components/content_settings/core/common/content_settings.h" |
95 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" | 95 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" |
96 #include "components/dom_distiller/core/url_constants.h" | 96 #include "components/dom_distiller/core/url_constants.h" |
97 #include "components/google/core/browser/google_util.h" | 97 #include "components/google/core/browser/google_util.h" |
98 #include "components/metrics/client_info.h" | 98 #include "components/metrics/client_info.h" |
99 #include "components/pref_registry/pref_registry_syncable.h" | 99 #include "components/pref_registry/pref_registry_syncable.h" |
| 100 #include "components/rappor/rappor_message_filter.h" |
100 #include "components/rappor/rappor_utils.h" | 101 #include "components/rappor/rappor_utils.h" |
101 #include "components/signin/core/common/profile_management_switches.h" | 102 #include "components/signin/core/common/profile_management_switches.h" |
102 #include "components/translate/core/common/translate_switches.h" | 103 #include "components/translate/core/common/translate_switches.h" |
103 #include "components/url_fixer/url_fixer.h" | 104 #include "components/url_fixer/url_fixer.h" |
104 #include "content/public/browser/browser_child_process_host.h" | 105 #include "content/public/browser/browser_child_process_host.h" |
105 #include "content/public/browser/browser_main_parts.h" | 106 #include "content/public/browser/browser_main_parts.h" |
106 #include "content/public/browser/browser_ppapi_host.h" | 107 #include "content/public/browser/browser_ppapi_host.h" |
107 #include "content/public/browser/browser_thread.h" | 108 #include "content/public/browser/browser_thread.h" |
108 #include "content/public/browser/browser_url_handler.h" | 109 #include "content/public/browser/browser_url_handler.h" |
109 #include "content/public/browser/child_process_data.h" | 110 #include "content/public/browser/child_process_data.h" |
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
829 profile->GetPath(), | 830 profile->GetPath(), |
830 context)); | 831 context)); |
831 #endif | 832 #endif |
832 #if defined(OS_ANDROID) | 833 #if defined(OS_ANDROID) |
833 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 834 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
834 #endif | 835 #endif |
835 DataReductionProxyChromeSettings* data_reduction_proxy_settings = | 836 DataReductionProxyChromeSettings* data_reduction_proxy_settings = |
836 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile); | 837 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile); |
837 host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter( | 838 host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter( |
838 data_reduction_proxy_settings)); | 839 data_reduction_proxy_settings)); |
| 840 host->AddFilter(new rappor::RapporMessageFilter( |
| 841 g_browser_process->rappor_service())); |
839 | 842 |
840 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 843 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
841 profile->IsOffTheRecord())); | 844 profile->IsOffTheRecord())); |
842 | 845 |
843 for (size_t i = 0; i < extra_parts_.size(); ++i) | 846 for (size_t i = 0; i < extra_parts_.size(); ++i) |
844 extra_parts_[i]->RenderProcessWillLaunch(host); | 847 extra_parts_[i]->RenderProcessWillLaunch(host); |
845 | 848 |
846 RendererContentSettingRules rules; | 849 RendererContentSettingRules rules; |
847 if (host->IsIsolatedGuest()) { | 850 if (host->IsIsolatedGuest()) { |
848 #if defined(ENABLE_EXTENSIONS) | 851 #if defined(ENABLE_EXTENSIONS) |
(...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2416 switches::kDisableWebRtcEncryption, | 2419 switches::kDisableWebRtcEncryption, |
2417 }; | 2420 }; |
2418 to_command_line->CopySwitchesFrom(from_command_line, | 2421 to_command_line->CopySwitchesFrom(from_command_line, |
2419 kWebRtcDevSwitchNames, | 2422 kWebRtcDevSwitchNames, |
2420 arraysize(kWebRtcDevSwitchNames)); | 2423 arraysize(kWebRtcDevSwitchNames)); |
2421 } | 2424 } |
2422 } | 2425 } |
2423 #endif // defined(ENABLE_WEBRTC) | 2426 #endif // defined(ENABLE_WEBRTC) |
2424 | 2427 |
2425 } // namespace chrome | 2428 } // namespace chrome |
OLD | NEW |