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

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

Issue 10006041: Remove PrerenderResourceThrottle and related infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More uprooting Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/prerender/prerender_tracker_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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_resource_throttle.h" 11 #include "chrome/browser/download/download_resource_throttle.h"
12 #include "chrome/browser/download/download_util.h" 12 #include "chrome/browser/download/download_util.h"
13 #include "chrome/browser/extensions/user_script_listener.h" 13 #include "chrome/browser/extensions/user_script_listener.h"
14 #include "chrome/browser/external_protocol/external_protocol_handler.h" 14 #include "chrome/browser/external_protocol/external_protocol_handler.h"
15 #include "chrome/browser/instant/instant_loader.h" 15 #include "chrome/browser/instant/instant_loader.h"
16 #include "chrome/browser/net/load_timing_observer.h" 16 #include "chrome/browser/net/load_timing_observer.h"
17 #include "chrome/browser/prerender/prerender_manager.h" 17 #include "chrome/browser/prerender/prerender_manager.h"
18 #include "chrome/browser/prerender/prerender_manager_factory.h" 18 #include "chrome/browser/prerender/prerender_manager_factory.h"
19 #include "chrome/browser/prerender/prerender_resource_throttle.h"
20 #include "chrome/browser/prerender/prerender_tracker.h" 19 #include "chrome/browser/prerender/prerender_tracker.h"
21 #include "chrome/browser/profiles/profile_io_data.h" 20 #include "chrome/browser/profiles/profile_io_data.h"
22 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h" 21 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h"
23 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h" 22 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
24 #include "chrome/browser/renderer_host/transfer_navigation_resource_throttle.h" 23 #include "chrome/browser/renderer_host/transfer_navigation_resource_throttle.h"
25 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 24 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
26 #include "chrome/browser/ui/auto_login_prompter.h" 25 #include "chrome/browser/ui/auto_login_prompter.h"
27 #include "chrome/browser/ui/login/login_prompt.h" 26 #include "chrome/browser/ui/login/login_prompt.h"
28 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 27 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
29 #include "chrome/common/chrome_notification_types.h" 28 #include "chrome/common/chrome_notification_types.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 154
156 if (resource_type == ResourceType::MAIN_FRAME) { 155 if (resource_type == ResourceType::MAIN_FRAME) {
157 throttles->push_back(new TransferNavigationResourceThrottle(request)); 156 throttles->push_back(new TransferNavigationResourceThrottle(request));
158 157
159 #if defined(OS_CHROMEOS) 158 #if defined(OS_CHROMEOS)
160 // We check offline first, then check safe browsing so that we still can 159 // We check offline first, then check safe browsing so that we still can
161 // block unsafe site after we remove offline page. 160 // block unsafe site after we remove offline page.
162 throttles->push_back(new OfflineResourceThrottle( 161 throttles->push_back(new OfflineResourceThrottle(
163 child_id, route_id, request, resource_context)); 162 child_id, route_id, request, resource_context));
164 #endif 163 #endif
165
166 throttles->push_back(
167 new prerender::PrerenderResourceThrottle(prerender_tracker_,
168 request,
169 child_id,
170 route_id));
171 } 164 }
172 165
173 AppendStandardResourceThrottles(request, 166 AppendStandardResourceThrottles(request,
174 resource_context, 167 resource_context,
175 child_id, 168 child_id,
176 route_id, 169 route_id,
177 resource_type, 170 resource_type,
178 throttles); 171 throttles);
179 } 172 }
180 173
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 #if defined(ENABLE_ONE_CLICK_SIGNIN) 337 #if defined(ENABLE_ONE_CLICK_SIGNIN)
345 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); 338 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
346 339
347 // See if the response contains the Google-Accounts-SignIn header. If so, 340 // See if the response contains the Google-Accounts-SignIn header. If so,
348 // then the user has just finished signing in, and the server is allowing the 341 // then the user has just finished signing in, and the server is allowing the
349 // browser to suggest connecting the user's profile to the account. 342 // browser to suggest connecting the user's profile to the account.
350 OneClickSigninHelper::ShowInfoBarIfPossible(request, info->GetChildID(), 343 OneClickSigninHelper::ShowInfoBarIfPossible(request, info->GetChildID(),
351 info->GetRouteID()); 344 info->GetRouteID());
352 #endif 345 #endif
353 } 346 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_tracker_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698