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

Side by Side Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 8879051: Revert 113785 - Enable TransferNavigationResourceHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | Annotate | Revision Log
OLDNEW
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
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)
186 handler = new TransferNavigationResourceHandler( 189 handler = new TransferNavigationResourceHandler(
187 handler, resource_dispatcher_host_, request); 190 handler, resource_dispatcher_host_, request);
191 #endif
188 192
189 return handler; 193 return handler;
190 } 194 }
191 195
192 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( 196 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting(
193 ResourceHandler* handler, 197 ResourceHandler* handler,
194 const content::ResourceContext& resource_context, 198 const content::ResourceContext& resource_context,
195 net::URLRequest* request, 199 net::URLRequest* request,
196 int child_id, 200 int child_id,
197 int route_id, 201 int route_id,
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->child_id(), 348 AutoLoginPrompter::ShowInfoBarIfPossible(request, info->child_id(),
345 info->route_id()); 349 info->route_id());
346 } 350 }
347 351
348 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( 352 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
349 net::URLRequest* request, 353 net::URLRequest* request,
350 content::ResourceResponse* response, 354 content::ResourceResponse* response,
351 ResourceMessageFilter* filter) { 355 ResourceMessageFilter* filter) {
352 LoadTimingObserver::PopulateTimingInfo(request, response); 356 LoadTimingObserver::PopulateTimingInfo(request, response);
353 } 357 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/app_process_apitest.cc ('k') | chrome/test/data/extensions/api_test/webrequest/test_blocking.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698