Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(560)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 966443002: Add DataReductionProxy IPC to determine if the Data Reduction Proxy was used. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to head Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 25 matching lines...) Expand all
36 #include "chrome/browser/geolocation/chrome_access_token_store.h" 36 #include "chrome/browser/geolocation/chrome_access_token_store.h"
37 #include "chrome/browser/geolocation/geolocation_permission_context.h" 37 #include "chrome/browser/geolocation/geolocation_permission_context.h"
38 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" 38 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
39 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 39 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
40 #include "chrome/browser/media/midi_permission_context.h" 40 #include "chrome/browser/media/midi_permission_context.h"
41 #include "chrome/browser/media/midi_permission_context_factory.h" 41 #include "chrome/browser/media/midi_permission_context_factory.h"
42 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 42 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
43 #include "chrome/browser/metrics/rappor/sampling.h" 43 #include "chrome/browser/metrics/rappor/sampling.h"
44 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 44 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
45 #include "chrome/browser/net/chrome_net_log.h" 45 #include "chrome/browser/net/chrome_net_log.h"
46 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
47 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
46 #include "chrome/browser/notifications/desktop_notification_service.h" 48 #include "chrome/browser/notifications/desktop_notification_service.h"
47 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 49 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
48 #include "chrome/browser/notifications/platform_notification_service_impl.h" 50 #include "chrome/browser/notifications/platform_notification_service_impl.h"
49 #include "chrome/browser/platform_util.h" 51 #include "chrome/browser/platform_util.h"
50 #include "chrome/browser/prerender/prerender_final_status.h" 52 #include "chrome/browser/prerender/prerender_final_status.h"
51 #include "chrome/browser/prerender/prerender_manager.h" 53 #include "chrome/browser/prerender/prerender_manager.h"
52 #include "chrome/browser/prerender/prerender_manager_factory.h" 54 #include "chrome/browser/prerender/prerender_manager_factory.h"
53 #include "chrome/browser/prerender/prerender_message_filter.h" 55 #include "chrome/browser/prerender/prerender_message_filter.h"
54 #include "chrome/browser/prerender/prerender_tracker.h" 56 #include "chrome/browser/prerender/prerender_tracker.h"
55 #include "chrome/browser/printing/printing_message_filter.h" 57 #include "chrome/browser/printing/printing_message_filter.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "chrome/grit/generated_resources.h" 95 #include "chrome/grit/generated_resources.h"
94 #include "chrome/installer/util/google_update_settings.h" 96 #include "chrome/installer/util/google_update_settings.h"
95 #include "chromeos/chromeos_constants.h" 97 #include "chromeos/chromeos_constants.h"
96 #include "components/cdm/browser/cdm_message_filter_android.h" 98 #include "components/cdm/browser/cdm_message_filter_android.h"
97 #include "components/cloud_devices/common/cloud_devices_switches.h" 99 #include "components/cloud_devices/common/cloud_devices_switches.h"
98 #include "components/content_settings/core/browser/content_settings_provider.h" 100 #include "components/content_settings/core/browser/content_settings_provider.h"
99 #include "components/content_settings/core/browser/content_settings_utils.h" 101 #include "components/content_settings/core/browser/content_settings_utils.h"
100 #include "components/content_settings/core/browser/host_content_settings_map.h" 102 #include "components/content_settings/core/browser/host_content_settings_map.h"
101 #include "components/content_settings/core/common/content_settings.h" 103 #include "components/content_settings/core/common/content_settings.h"
102 #include "components/content_settings/core/common/permission_request_id.h" 104 #include "components/content_settings/core/common/permission_request_id.h"
105 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h"
103 #include "components/dom_distiller/core/url_constants.h" 106 #include "components/dom_distiller/core/url_constants.h"
104 #include "components/google/core/browser/google_util.h" 107 #include "components/google/core/browser/google_util.h"
105 #include "components/metrics/client_info.h" 108 #include "components/metrics/client_info.h"
106 #include "components/pref_registry/pref_registry_syncable.h" 109 #include "components/pref_registry/pref_registry_syncable.h"
107 #include "components/signin/core/common/profile_management_switches.h" 110 #include "components/signin/core/common/profile_management_switches.h"
108 #include "components/translate/core/common/translate_switches.h" 111 #include "components/translate/core/common/translate_switches.h"
109 #include "components/url_fixer/url_fixer.h" 112 #include "components/url_fixer/url_fixer.h"
110 #include "content/public/browser/browser_child_process_host.h" 113 #include "content/public/browser/browser_child_process_host.h"
111 #include "content/public/browser/browser_main_parts.h" 114 #include "content/public/browser/browser_main_parts.h"
112 #include "content/public/browser/browser_ppapi_host.h" 115 #include "content/public/browser/browser_ppapi_host.h"
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 id, profile->IsOffTheRecord(), 934 id, profile->IsOffTheRecord(),
932 profile->GetPath(), 935 profile->GetPath(),
933 context)); 936 context));
934 #endif 937 #endif
935 #if defined(OS_ANDROID) 938 #if defined(OS_ANDROID)
936 host->AddFilter(new cdm::CdmMessageFilterAndroid()); 939 host->AddFilter(new cdm::CdmMessageFilterAndroid());
937 #endif 940 #endif
938 if (switches::IsEnableAccountConsistency()) 941 if (switches::IsEnableAccountConsistency())
939 host->AddFilter(new PrincipalsMessageFilter(id)); 942 host->AddFilter(new PrincipalsMessageFilter(id));
940 943
944 DataReductionProxyChromeSettings* data_reduction_proxy_settings =
945 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile);
946 if (data_reduction_proxy_settings) {
947 host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter(
948 data_reduction_proxy_settings));
949 }
950
941 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 951 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
942 profile->IsOffTheRecord())); 952 profile->IsOffTheRecord()));
943 953
944 for (size_t i = 0; i < extra_parts_.size(); ++i) 954 for (size_t i = 0; i < extra_parts_.size(); ++i)
945 extra_parts_[i]->RenderProcessWillLaunch(host); 955 extra_parts_[i]->RenderProcessWillLaunch(host);
946 956
947 RendererContentSettingRules rules; 957 RendererContentSettingRules rules;
948 if (host->IsIsolatedGuest()) { 958 if (host->IsIsolatedGuest()) {
949 #if defined(ENABLE_EXTENSIONS) 959 #if defined(ENABLE_EXTENSIONS)
950 GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules); 960 GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules);
(...skipping 1694 matching lines...) Expand 10 before | Expand all | Expand 10 after
2645 switches::kDisableWebRtcEncryption, 2655 switches::kDisableWebRtcEncryption,
2646 }; 2656 };
2647 to_command_line->CopySwitchesFrom(from_command_line, 2657 to_command_line->CopySwitchesFrom(from_command_line,
2648 kWebRtcDevSwitchNames, 2658 kWebRtcDevSwitchNames,
2649 arraysize(kWebRtcDevSwitchNames)); 2659 arraysize(kWebRtcDevSwitchNames));
2650 } 2660 }
2651 } 2661 }
2652 #endif // defined(ENABLE_WEBRTC) 2662 #endif // defined(ENABLE_WEBRTC)
2653 2663
2654 } // namespace chrome 2664 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698