Chromium Code Reviews| 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/net/chrome_network_delegate.h" | 5 #include "chrome/browser/net/chrome_network_delegate.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/content_settings/cookie_settings.h" | 9 #include "chrome/browser/content_settings/cookie_settings.h" |
| 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| 11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 12 #include "chrome/browser/extensions/api/proxy/proxy_api.h" | 12 #include "chrome/browser/extensions/api/proxy/proxy_api.h" |
| 13 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 13 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
| 14 #include "chrome/browser/extensions/extension_event_router_forwarder.h" | 14 #include "chrome/browser/extensions/extension_event_router_forwarder.h" |
| 15 #include "chrome/browser/extensions/extension_info_map.h" | 15 #include "chrome/browser/extensions/extension_info_map.h" |
| 16 #include "chrome/browser/extensions/extension_process_manager.h" | 16 #include "chrome/browser/extensions/extension_process_manager.h" |
| 17 #include "chrome/browser/google/google_util.h" | |
| 18 #include "chrome/browser/metrics/metrics_service.h" | |
| 17 #include "chrome/browser/prefs/pref_member.h" | 19 #include "chrome/browser/prefs/pref_member.h" |
| 18 #include "chrome/browser/profiles/profile_manager.h" | 20 #include "chrome/browser/profiles/profile_manager.h" |
| 19 #include "chrome/browser/task_manager/task_manager.h" | 21 #include "chrome/browser/task_manager/task_manager.h" |
| 20 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
| 21 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
| 22 #include "content/public/browser/render_view_host.h" | 24 #include "content/public/browser/render_view_host.h" |
| 23 #include "content/public/browser/resource_request_info.h" | 25 #include "content/public/browser/resource_request_info.h" |
| 24 #include "net/base/host_port_pair.h" | 26 #include "net/base/host_port_pair.h" |
| 25 #include "net/base/net_errors.h" | 27 #include "net/base/net_errors.h" |
| 26 #include "net/base/net_log.h" | 28 #include "net/base/net_log.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 } | 106 } |
| 105 | 107 |
| 106 } // namespace | 108 } // namespace |
| 107 | 109 |
| 108 ChromeNetworkDelegate::ChromeNetworkDelegate( | 110 ChromeNetworkDelegate::ChromeNetworkDelegate( |
| 109 ExtensionEventRouterForwarder* event_router, | 111 ExtensionEventRouterForwarder* event_router, |
| 110 ExtensionInfoMap* extension_info_map, | 112 ExtensionInfoMap* extension_info_map, |
| 111 const policy::URLBlacklistManager* url_blacklist_manager, | 113 const policy::URLBlacklistManager* url_blacklist_manager, |
| 112 void* profile, | 114 void* profile, |
| 113 CookieSettings* cookie_settings, | 115 CookieSettings* cookie_settings, |
| 116 bool is_incognito, | |
| 114 BooleanPrefMember* enable_referrers) | 117 BooleanPrefMember* enable_referrers) |
| 115 : event_router_(event_router), | 118 : event_router_(event_router), |
| 116 profile_(profile), | 119 profile_(profile), |
| 117 cookie_settings_(cookie_settings), | 120 cookie_settings_(cookie_settings), |
| 121 is_incognito_(is_incognito), | |
| 118 extension_info_map_(extension_info_map), | 122 extension_info_map_(extension_info_map), |
| 119 enable_referrers_(enable_referrers), | 123 enable_referrers_(enable_referrers), |
| 120 url_blacklist_manager_(url_blacklist_manager) { | 124 url_blacklist_manager_(url_blacklist_manager) { |
| 121 DCHECK(event_router); | 125 DCHECK(event_router); |
| 122 DCHECK(enable_referrers); | 126 DCHECK(enable_referrers); |
| 123 DCHECK(!profile || cookie_settings); | 127 DCHECK(!profile || cookie_settings); |
| 124 } | 128 } |
| 125 | 129 |
| 126 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} | 130 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} |
| 127 | 131 |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 158 if (!enable_referrers_->GetValue()) | 162 if (!enable_referrers_->GetValue()) |
| 159 request->set_referrer(std::string()); | 163 request->set_referrer(std::string()); |
| 160 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( | 164 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( |
| 161 profile_, extension_info_map_.get(), request, callback, new_url); | 165 profile_, extension_info_map_.get(), request, callback, new_url); |
| 162 } | 166 } |
| 163 | 167 |
| 164 int ChromeNetworkDelegate::OnBeforeSendHeaders( | 168 int ChromeNetworkDelegate::OnBeforeSendHeaders( |
| 165 net::URLRequest* request, | 169 net::URLRequest* request, |
| 166 const net::CompletionCallback& callback, | 170 const net::CompletionCallback& callback, |
| 167 net::HttpRequestHeaders* headers) { | 171 net::HttpRequestHeaders* headers) { |
| 172 // Attach any applicable Chrome metrics headers. This is a best-effort attempt | |
| 173 // where failure will not cause OnBeforeSendHeaders to back out. | |
| 174 AddChromeMetricsStateHeader(request, headers); | |
| 175 | |
| 168 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( | 176 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( |
| 169 profile_, extension_info_map_.get(), request, callback, headers); | 177 profile_, extension_info_map_.get(), request, callback, headers); |
| 170 } | 178 } |
| 171 | 179 |
| 172 void ChromeNetworkDelegate::OnSendHeaders( | 180 void ChromeNetworkDelegate::OnSendHeaders( |
| 173 net::URLRequest* request, | 181 net::URLRequest* request, |
| 174 const net::HttpRequestHeaders& headers) { | 182 const net::HttpRequestHeaders& headers) { |
| 175 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( | 183 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( |
| 176 profile_, extension_info_map_.get(), request, headers); | 184 profile_, extension_info_map_.get(), request, headers); |
| 177 } | 185 } |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 297 BrowserThread::PostTask( | 305 BrowserThread::PostTask( |
| 298 BrowserThread::UI, FROM_HERE, | 306 BrowserThread::UI, FROM_HERE, |
| 299 base::Bind(&TabSpecificContentSettings::CookieChanged, | 307 base::Bind(&TabSpecificContentSettings::CookieChanged, |
| 300 render_process_id, render_view_id, | 308 render_process_id, render_view_id, |
| 301 request->url(), request->first_party_for_cookies(), | 309 request->url(), request->first_party_for_cookies(), |
| 302 cookie_line, *options, !allow)); | 310 cookie_line, *options, !allow)); |
| 303 } | 311 } |
| 304 | 312 |
| 305 return allow; | 313 return allow; |
| 306 } | 314 } |
| 315 | |
| 316 void ChromeNetworkDelegate::AddChromeMetricsStateHeader( | |
| 317 net::URLRequest* request, | |
| 318 net::HttpRequestHeaders* headers) { | |
| 319 // Note our criteria for attaching Chrome experiment headers: | |
| 320 // 1. We only transmit to *.google.<TLD> domains. NOTE that this use of | |
| 321 // google_util helpers to check this does not guarantee that the URL is | |
| 322 // Google-owned, only that it is of the form *.google.<TLD>. In the future | |
| 323 // we may choose to reinforce this check. | |
| 324 // 2. We must verify that we are transmitting for a profile network context | |
| 325 // and not the system context. We do this by checking |profile_|, as it is | |
| 326 // NULL when we're in the system context. | |
| 327 // 3. We only transmit for non Off The Record profiles. | |
|
Ilya Sherman
2012/04/17 20:55:39
nit: s/Off The Record/Incognito
SteveT
2012/04/19 18:38:01
Done.
| |
| 328 // 4. For the X-Chrome-UMA-Enabled bit, we only set it if UMA is in fact | |
| 329 // enabled for this install of Chrome. | |
| 330 if (google_util::IsGoogleDomainUrl(request->url().spec(), | |
| 331 google_util::ALLOW_SUBDOMAIN) && | |
| 332 profile_ && !is_incognito_ && | |
| 333 MetricsServiceHelper::IsMetricsReportingEnabled()) { | |
|
battre
2012/04/17 20:33:02
Here we still have a threading problem. The Metric
SteveT
2012/04/17 23:26:44
Ah, yes. I see that we do something similar with t
Ilya Sherman
2012/04/17 23:33:13
I think it's probably ok to use a PrefMember, and
battre
2012/04/18 17:05:05
We could probably also put the PrefMember in Metri
SteveT
2012/04/19 18:38:01
Turns out letting the PrefMember live in ProfileIO
| |
| 334 headers->SetHeader("X-Chrome-UMA-Enabled", "1"); | |
| 335 } | |
| 336 } | |
| OLD | NEW |