OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer_host/chrome_resource_dispatcher_host_delegate.
h" | 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_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/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
10 #include "chrome/browser/download/download_request_limiter.h" | 10 #include "chrome/browser/download/download_request_limiter.h" |
11 #include "chrome/browser/download/download_throttling_resource_handler.h" | 11 #include "chrome/browser/download/download_throttling_resource_handler.h" |
12 #include "chrome/browser/download/download_util.h" | 12 #include "chrome/browser/download/download_util.h" |
13 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 13 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
14 #include "chrome/browser/instant/instant_loader.h" | 14 #include "chrome/browser/instant/instant_loader.h" |
15 #include "chrome/browser/net/load_timing_observer.h" | 15 #include "chrome/browser/net/load_timing_observer.h" |
16 #include "chrome/browser/prerender/prerender_manager.h" | 16 #include "chrome/browser/prerender/prerender_manager.h" |
17 #include "chrome/browser/prerender/prerender_manager_factory.h" | 17 #include "chrome/browser/prerender/prerender_manager_factory.h" |
18 #include "chrome/browser/prerender/prerender_tracker.h" | 18 #include "chrome/browser/prerender/prerender_tracker.h" |
19 #include "chrome/browser/profiles/profile_io_data.h" | 19 #include "chrome/browser/profiles/profile_io_data.h" |
20 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h" | 20 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h" |
21 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" | 21 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" |
| 22 #include "chrome/browser/renderer_host/transfer_navigation_resource_handler.h" |
22 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 23 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
23 #include "chrome/browser/ui/auto_login_prompter.h" | 24 #include "chrome/browser/ui/auto_login_prompter.h" |
24 #include "chrome/browser/ui/login/login_prompt.h" | 25 #include "chrome/browser/ui/login/login_prompt.h" |
25 #include "chrome/common/chrome_notification_types.h" | 26 #include "chrome/common/chrome_notification_types.h" |
26 #include "chrome/common/extensions/user_script.h" | 27 #include "chrome/common/extensions/user_script.h" |
27 #include "chrome/common/render_messages.h" | 28 #include "chrome/common/render_messages.h" |
28 #include "content/browser/renderer_host/render_view_host.h" | 29 #include "content/browser/renderer_host/render_view_host.h" |
29 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 30 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
30 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" | 31 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
31 #include "content/browser/renderer_host/resource_message_filter.h" | 32 #include "content/browser/renderer_host/resource_message_filter.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 | 145 |
145 return true; | 146 return true; |
146 } | 147 } |
147 | 148 |
148 ResourceHandler* ChromeResourceDispatcherHostDelegate::RequestBeginning( | 149 ResourceHandler* ChromeResourceDispatcherHostDelegate::RequestBeginning( |
149 ResourceHandler* handler, | 150 ResourceHandler* handler, |
150 net::URLRequest* request, | 151 net::URLRequest* request, |
151 const content::ResourceContext& resource_context, | 152 const content::ResourceContext& resource_context, |
152 bool is_subresource, | 153 bool is_subresource, |
153 int child_id, | 154 int child_id, |
154 int route_id) { | 155 int route_id, |
| 156 bool is_continuation_of_transferred_request) { |
| 157 if (is_continuation_of_transferred_request) |
| 158 ChromeURLRequestUserData::Delete(request); |
| 159 |
155 ChromeURLRequestUserData* user_data = | 160 ChromeURLRequestUserData* user_data = |
156 ChromeURLRequestUserData::Create(request); | 161 ChromeURLRequestUserData::Create(request); |
157 if (prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) { | 162 if (prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) { |
158 user_data->set_is_prerender(true); | 163 user_data->set_is_prerender(true); |
159 request->set_priority(net::IDLE); | 164 request->set_priority(net::IDLE); |
160 } | 165 } |
161 | 166 |
162 #if defined(ENABLE_SAFE_BROWSING) | 167 #if defined(ENABLE_SAFE_BROWSING) |
163 // Insert safe browsing at the front of the chain, so it gets to decide | 168 // Insert safe browsing at the front of the chain, so it gets to decide |
164 // on policies first. | 169 // on policies first. |
165 ProfileIOData* io_data = reinterpret_cast<ProfileIOData*>( | 170 ProfileIOData* io_data = reinterpret_cast<ProfileIOData*>( |
166 resource_context.GetUserData(NULL)); | 171 resource_context.GetUserData(NULL)); |
167 if (io_data->safe_browsing_enabled()->GetValue()) { | 172 if (io_data->safe_browsing_enabled()->GetValue()) { |
168 handler = CreateSafeBrowsingResourceHandler( | 173 handler = CreateSafeBrowsingResourceHandler( |
169 handler, child_id, route_id, is_subresource); | 174 handler, child_id, route_id, is_subresource); |
170 } | 175 } |
171 #endif | 176 #endif |
172 | 177 |
173 #if defined(OS_CHROMEOS) | 178 #if defined(OS_CHROMEOS) |
174 // We check offline first, then check safe browsing so that we still can block | 179 // We check offline first, then check safe browsing so that we still can block |
175 // unsafe site after we remove offline page. | 180 // unsafe site after we remove offline page. |
176 handler = new OfflineResourceHandler( | 181 handler = new OfflineResourceHandler( |
177 handler, child_id, route_id, resource_dispatcher_host_, request, | 182 handler, child_id, route_id, resource_dispatcher_host_, request, |
178 resource_context.appcache_service()); | 183 resource_context.appcache_service()); |
179 #endif | 184 #endif |
| 185 |
| 186 // TODO(mpcomplete): Leaving disabled for now, since I'm checking this in |
| 187 // close to the branch point. |
| 188 #if defined(TRANSFER_REDIRECTS_BUG79520) |
| 189 handler = new TransferNavigationResourceHandler( |
| 190 handler, resource_dispatcher_host_, request); |
| 191 #endif |
| 192 |
180 return handler; | 193 return handler; |
181 } | 194 } |
182 | 195 |
183 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( | 196 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( |
184 ResourceHandler* handler, | 197 ResourceHandler* handler, |
185 const content::ResourceContext& resource_context, | 198 const content::ResourceContext& resource_context, |
186 net::URLRequest* request, | 199 net::URLRequest* request, |
187 int child_id, | 200 int child_id, |
188 int route_id, | 201 int route_id, |
189 int request_id, | 202 int request_id, |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->child_id(), | 348 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->child_id(), |
336 info->route_id()); | 349 info->route_id()); |
337 } | 350 } |
338 | 351 |
339 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( | 352 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( |
340 net::URLRequest* request, | 353 net::URLRequest* request, |
341 content::ResourceResponse* response, | 354 content::ResourceResponse* response, |
342 ResourceMessageFilter* filter) { | 355 ResourceMessageFilter* filter) { |
343 LoadTimingObserver::PopulateTimingInfo(request, response); | 356 LoadTimingObserver::PopulateTimingInfo(request, response); |
344 } | 357 } |
OLD | NEW |