| 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" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 #endif | 176 #endif |
| 177 | 177 |
| 178 #if defined(OS_CHROMEOS) | 178 #if defined(OS_CHROMEOS) |
| 179 // 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 |
| 180 // unsafe site after we remove offline page. | 180 // unsafe site after we remove offline page. |
| 181 handler = new OfflineResourceHandler( | 181 handler = new OfflineResourceHandler( |
| 182 handler, child_id, route_id, resource_dispatcher_host_, request, | 182 handler, child_id, route_id, resource_dispatcher_host_, request, |
| 183 resource_context.appcache_service()); | 183 resource_context.appcache_service()); |
| 184 #endif | 184 #endif |
| 185 | 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( | 186 handler = new TransferNavigationResourceHandler( |
| 190 handler, resource_dispatcher_host_, request); | 187 handler, resource_dispatcher_host_, request); |
| 191 #endif | |
| 192 | 188 |
| 193 return handler; | 189 return handler; |
| 194 } | 190 } |
| 195 | 191 |
| 196 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( | 192 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( |
| 197 ResourceHandler* handler, | 193 ResourceHandler* handler, |
| 198 const content::ResourceContext& resource_context, | 194 const content::ResourceContext& resource_context, |
| 199 net::URLRequest* request, | 195 net::URLRequest* request, |
| 200 int child_id, | 196 int child_id, |
| 201 int route_id, | 197 int route_id, |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->child_id(), | 344 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->child_id(), |
| 349 info->route_id()); | 345 info->route_id()); |
| 350 } | 346 } |
| 351 | 347 |
| 352 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( | 348 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( |
| 353 net::URLRequest* request, | 349 net::URLRequest* request, |
| 354 content::ResourceResponse* response, | 350 content::ResourceResponse* response, |
| 355 ResourceMessageFilter* filter) { | 351 ResourceMessageFilter* filter) { |
| 356 LoadTimingObserver::PopulateTimingInfo(request, response); | 352 LoadTimingObserver::PopulateTimingInfo(request, response); |
| 357 } | 353 } |
| OLD | NEW |