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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 10416002: Seculative resource prefetching for URLs CL. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressing dominich's and willchan's comments. Created 8 years, 7 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
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/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/net/resource_prefetch_predictor_observer.h"
18 #include "chrome/browser/predictors/resource_prefetch_predictor.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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } 118 }
117 119
118 } // namespace 120 } // namespace
119 121
120 ChromeNetworkDelegate::ChromeNetworkDelegate( 122 ChromeNetworkDelegate::ChromeNetworkDelegate(
121 ExtensionEventRouterForwarder* event_router, 123 ExtensionEventRouterForwarder* event_router,
122 ExtensionInfoMap* extension_info_map, 124 ExtensionInfoMap* extension_info_map,
123 const policy::URLBlacklistManager* url_blacklist_manager, 125 const policy::URLBlacklistManager* url_blacklist_manager,
124 void* profile, 126 void* profile,
125 CookieSettings* cookie_settings, 127 CookieSettings* cookie_settings,
128 scoped_refptr<predictors::ResourcePrefetchPredictor>
129 resource_prefetch_predictor,
126 BooleanPrefMember* enable_referrers) 130 BooleanPrefMember* enable_referrers)
127 : event_router_(event_router), 131 : event_router_(event_router),
128 profile_(profile), 132 profile_(profile),
129 cookie_settings_(cookie_settings), 133 cookie_settings_(cookie_settings),
130 extension_info_map_(extension_info_map), 134 extension_info_map_(extension_info_map),
131 enable_referrers_(enable_referrers), 135 enable_referrers_(enable_referrers),
132 url_blacklist_manager_(url_blacklist_manager) { 136 url_blacklist_manager_(url_blacklist_manager) {
133 DCHECK(event_router); 137 DCHECK(event_router);
134 DCHECK(enable_referrers); 138 DCHECK(enable_referrers);
135 DCHECK(!profile || cookie_settings); 139 DCHECK(!profile || cookie_settings);
140
141 if (resource_prefetch_predictor)
142 resource_prefetch_predictor_observer_.reset(
143 new chrome_browser_net::ResourcePrefetchPredictorObserver(
144 resource_prefetch_predictor));
136 } 145 }
137 146
138 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 147 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
139 148
140 // static 149 // static
141 void ChromeNetworkDelegate::InitializeReferrersEnabled( 150 void ChromeNetworkDelegate::InitializeReferrersEnabled(
142 BooleanPrefMember* enable_referrers, 151 BooleanPrefMember* enable_referrers,
143 PrefService* pref_service) { 152 PrefService* pref_service) {
144 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 153 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
145 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); 154 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL);
(...skipping 19 matching lines...) Expand all
165 scoped_refptr<net::NetLog::EventParameters> params; 174 scoped_refptr<net::NetLog::EventParameters> params;
166 params = new net::NetLogStringParameter("url", request->url().spec()); 175 params = new net::NetLogStringParameter("url", request->url().spec());
167 request->net_log().AddEvent( 176 request->net_log().AddEvent(
168 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, params); 177 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, params);
169 return net::ERR_NETWORK_ACCESS_DENIED; 178 return net::ERR_NETWORK_ACCESS_DENIED;
170 } 179 }
171 #endif 180 #endif
172 181
173 ForwardRequestStatus(REQUEST_STARTED, request, profile_); 182 ForwardRequestStatus(REQUEST_STARTED, request, profile_);
174 183
184 if (resource_prefetch_predictor_observer_.get())
dominich 2012/05/24 16:07:53 Is there a way to create a ProfileKeyedService on
Shishir 2012/05/30 01:07:51 The ProfileKeyedServices are all created together
185 resource_prefetch_predictor_observer_->OnBeforeURLRequest(request);
186
175 if (!enable_referrers_->GetValue()) 187 if (!enable_referrers_->GetValue())
176 request->set_referrer(std::string()); 188 request->set_referrer(std::string());
177 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 189 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
178 profile_, extension_info_map_.get(), request, callback, new_url); 190 profile_, extension_info_map_.get(), request, callback, new_url);
179 } 191 }
180 192
181 int ChromeNetworkDelegate::OnBeforeSendHeaders( 193 int ChromeNetworkDelegate::OnBeforeSendHeaders(
182 net::URLRequest* request, 194 net::URLRequest* request,
183 const net::CompletionCallback& callback, 195 const net::CompletionCallback& callback,
184 net::HttpRequestHeaders* headers) { 196 net::HttpRequestHeaders* headers) {
(...skipping 15 matching lines...) Expand all
200 scoped_refptr<net::HttpResponseHeaders>* override_response_headers) { 212 scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
201 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived( 213 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived(
202 profile_, extension_info_map_.get(), request, callback, 214 profile_, extension_info_map_.get(), request, callback,
203 original_response_headers, override_response_headers); 215 original_response_headers, override_response_headers);
204 } 216 }
205 217
206 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request, 218 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
207 const GURL& new_location) { 219 const GURL& new_location) {
208 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect( 220 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect(
209 profile_, extension_info_map_.get(), request, new_location); 221 profile_, extension_info_map_.get(), request, new_location);
222 if (resource_prefetch_predictor_observer_.get())
223 resource_prefetch_predictor_observer_->OnBeforeRedirect(request);
210 } 224 }
211 225
212 226
213 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) { 227 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
214 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted( 228 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted(
215 profile_, extension_info_map_.get(), request); 229 profile_, extension_info_map_.get(), request);
216 ForwardProxyErrors(request, event_router_.get(), profile_); 230 ForwardProxyErrors(request, event_router_.get(), profile_);
231 if (resource_prefetch_predictor_observer_.get())
232 resource_prefetch_predictor_observer_->OnResponseStarted(request);
217 } 233 }
218 234
219 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request, 235 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request,
220 int bytes_read) { 236 int bytes_read) {
221 #if defined(ENABLE_TASK_MANAGER) 237 #if defined(ENABLE_TASK_MANAGER)
222 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); 238 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
223 #endif // defined(ENABLE_TASK_MANAGER) 239 #endif // defined(ENABLE_TASK_MANAGER)
224 } 240 }
225 241
226 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request, 242 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 if (white_listed_path == path.StripTrailingSeparators() || 366 if (white_listed_path == path.StripTrailingSeparators() ||
351 white_listed_path.IsParent(path)) { 367 white_listed_path.IsParent(path)) {
352 return true; 368 return true;
353 } 369 }
354 } 370 }
355 return false; 371 return false;
356 #else 372 #else
357 return true; 373 return true;
358 #endif // defined(OS_CHROMEOS) 374 #endif // defined(OS_CHROMEOS)
359 } 375 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698