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

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

Issue 1014543003: Add an IPC method for Blink to call RapporService::RecordSample() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments and cleanup Created 5 years, 8 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 | « no previous file | chrome/renderer/DEPS » ('j') | chrome/renderer/chrome_content_renderer_client.h » ('J')
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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "components/cdm/browser/cdm_message_filter_android.h" 88 #include "components/cdm/browser/cdm_message_filter_android.h"
89 #include "components/cloud_devices/common/cloud_devices_switches.h" 89 #include "components/cloud_devices/common/cloud_devices_switches.h"
90 #include "components/content_settings/core/browser/content_settings_utils.h" 90 #include "components/content_settings/core/browser/content_settings_utils.h"
91 #include "components/content_settings/core/browser/host_content_settings_map.h" 91 #include "components/content_settings/core/browser/host_content_settings_map.h"
92 #include "components/content_settings/core/common/content_settings.h" 92 #include "components/content_settings/core/common/content_settings.h"
93 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h" 93 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h"
94 #include "components/dom_distiller/core/url_constants.h" 94 #include "components/dom_distiller/core/url_constants.h"
95 #include "components/google/core/browser/google_util.h" 95 #include "components/google/core/browser/google_util.h"
96 #include "components/metrics/client_info.h" 96 #include "components/metrics/client_info.h"
97 #include "components/pref_registry/pref_registry_syncable.h" 97 #include "components/pref_registry/pref_registry_syncable.h"
98 #include "components/rappor/rappor_message_filter.h"
98 #include "components/rappor/rappor_utils.h" 99 #include "components/rappor/rappor_utils.h"
99 #include "components/signin/core/common/profile_management_switches.h" 100 #include "components/signin/core/common/profile_management_switches.h"
100 #include "components/translate/core/common/translate_switches.h" 101 #include "components/translate/core/common/translate_switches.h"
101 #include "components/url_fixer/url_fixer.h" 102 #include "components/url_fixer/url_fixer.h"
102 #include "content/public/browser/browser_child_process_host.h" 103 #include "content/public/browser/browser_child_process_host.h"
103 #include "content/public/browser/browser_main_parts.h" 104 #include "content/public/browser/browser_main_parts.h"
104 #include "content/public/browser/browser_ppapi_host.h" 105 #include "content/public/browser/browser_ppapi_host.h"
105 #include "content/public/browser/browser_thread.h" 106 #include "content/public/browser/browser_thread.h"
106 #include "content/public/browser/browser_url_handler.h" 107 #include "content/public/browser/browser_url_handler.h"
107 #include "content/public/browser/child_process_data.h" 108 #include "content/public/browser/child_process_data.h"
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 #if defined(ENABLE_EXTENSIONS) 847 #if defined(ENABLE_EXTENSIONS)
847 GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules); 848 GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules);
848 #else 849 #else
849 NOTREACHED(); 850 NOTREACHED();
850 #endif 851 #endif
851 } else { 852 } else {
852 GetRendererContentSettingRules( 853 GetRendererContentSettingRules(
853 profile->GetHostContentSettingsMap(), &rules); 854 profile->GetHostContentSettingsMap(), &rules);
854 } 855 }
855 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); 856 host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
857
858
859 host->AddFilter(new rappor::RapporMessageFilter(
jam 2015/04/02 16:24:14 nit: add this above where the other filters are ad
860 g_browser_process->rappor_service()));
856 } 861 }
857 862
858 GURL ChromeContentBrowserClient::GetEffectiveURL( 863 GURL ChromeContentBrowserClient::GetEffectiveURL(
859 content::BrowserContext* browser_context, const GURL& url) { 864 content::BrowserContext* browser_context, const GURL& url) {
860 Profile* profile = Profile::FromBrowserContext(browser_context); 865 Profile* profile = Profile::FromBrowserContext(browser_context);
861 if (!profile) 866 if (!profile)
862 return url; 867 return url;
863 868
864 // If the input |url| should be assigned to the Instant renderer, make its 869 // If the input |url| should be assigned to the Instant renderer, make its
865 // effective URL distinct from other URLs on the search provider's domain. 870 // effective URL distinct from other URLs on the search provider's domain.
(...skipping 1548 matching lines...) Expand 10 before | Expand all | Expand 10 after
2414 switches::kDisableWebRtcEncryption, 2419 switches::kDisableWebRtcEncryption,
2415 }; 2420 };
2416 to_command_line->CopySwitchesFrom(from_command_line, 2421 to_command_line->CopySwitchesFrom(from_command_line,
2417 kWebRtcDevSwitchNames, 2422 kWebRtcDevSwitchNames,
2418 arraysize(kWebRtcDevSwitchNames)); 2423 arraysize(kWebRtcDevSwitchNames));
2419 } 2424 }
2420 } 2425 }
2421 #endif // defined(ENABLE_WEBRTC) 2426 #endif // defined(ENABLE_WEBRTC)
2422 2427
2423 } // namespace chrome 2428 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/DEPS » ('j') | chrome/renderer/chrome_content_renderer_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698