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

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

Issue 797443002: Remove prerender sessionStorage namespace merging (1/2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 11 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
« no previous file with comments | « chrome/browser/prerender/prerender_tracker.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/guid.h" 11 #include "base/guid.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/component_updater/component_updater_resource_throttle.h " 15 #include "chrome/browser/component_updater/component_updater_resource_throttle.h "
16 #include "chrome/browser/download/download_request_limiter.h" 16 #include "chrome/browser/download/download_request_limiter.h"
17 #include "chrome/browser/download/download_resource_throttle.h" 17 #include "chrome/browser/download/download_resource_throttle.h"
18 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" 18 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
19 #include "chrome/browser/prefetch/prefetch.h" 19 #include "chrome/browser/prefetch/prefetch.h"
20 #include "chrome/browser/prerender/prerender_manager.h" 20 #include "chrome/browser/prerender/prerender_manager.h"
21 #include "chrome/browser/prerender/prerender_manager_factory.h" 21 #include "chrome/browser/prerender/prerender_manager_factory.h"
22 #include "chrome/browser/prerender/prerender_pending_swap_throttle.h"
23 #include "chrome/browser/prerender/prerender_resource_throttle.h" 22 #include "chrome/browser/prerender/prerender_resource_throttle.h"
24 #include "chrome/browser/prerender/prerender_tracker.h" 23 #include "chrome/browser/prerender/prerender_tracker.h"
25 #include "chrome/browser/prerender/prerender_util.h" 24 #include "chrome/browser/prerender/prerender_util.h"
26 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/profiles/profile_io_data.h" 26 #include "chrome/browser/profiles/profile_io_data.h"
28 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h " 27 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h "
29 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 28 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
30 #include "chrome/browser/signin/signin_header_helper.h" 29 #include "chrome/browser/signin/signin_header_helper.h"
31 #include "chrome/browser/tab_contents/tab_util.h" 30 #include "chrome/browser/tab_contents/tab_util.h"
32 #include "chrome/browser/ui/login/login_prompt.h" 31 #include "chrome/browser/ui/login/login_prompt.h"
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 user_script_listener_->CreateResourceThrottle(request->url(), 535 user_script_listener_->CreateResourceThrottle(request->url(),
537 resource_type); 536 resource_type);
538 if (throttle) 537 if (throttle)
539 throttles->push_back(throttle); 538 throttles->push_back(throttle);
540 #endif 539 #endif
541 540
542 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); 541 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
543 if (info->GetVisibilityState() == blink::WebPageVisibilityStatePrerender) { 542 if (info->GetVisibilityState() == blink::WebPageVisibilityStatePrerender) {
544 throttles->push_back(new prerender::PrerenderResourceThrottle(request)); 543 throttles->push_back(new prerender::PrerenderResourceThrottle(request));
545 } 544 }
546 if (prerender_tracker_->IsPendingSwapRequestOnIOThread(
547 info->GetChildID(), info->GetRenderFrameID(), request->url())) {
548 throttles->push_back(new prerender::PrerenderPendingSwapThrottle(
549 request, prerender_tracker_));
550 }
551 } 545 }
552 546
553 #if defined(ENABLE_ONE_CLICK_SIGNIN) 547 #if defined(ENABLE_ONE_CLICK_SIGNIN)
554 void ChromeResourceDispatcherHostDelegate::AppendChromeSyncGaiaHeader( 548 void ChromeResourceDispatcherHostDelegate::AppendChromeSyncGaiaHeader(
555 net::URLRequest* request, 549 net::URLRequest* request,
556 content::ResourceContext* resource_context) { 550 content::ResourceContext* resource_context) {
557 static const char kAllowChromeSignIn[] = "Allow-Chrome-SignIn"; 551 static const char kAllowChromeSignIn[] = "Allow-Chrome-SignIn";
558 552
559 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); 553 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
560 OneClickSigninHelper::Offer offer = 554 OneClickSigninHelper::Offer offer =
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 url_request->GetTotalReceivedBytes())); 750 url_request->GetTotalReceivedBytes()));
757 } 751 }
758 } 752 }
759 753
760 // static 754 // static
761 void ChromeResourceDispatcherHostDelegate:: 755 void ChromeResourceDispatcherHostDelegate::
762 SetExternalProtocolHandlerDelegateForTesting( 756 SetExternalProtocolHandlerDelegateForTesting(
763 ExternalProtocolHandler::Delegate* delegate) { 757 ExternalProtocolHandler::Delegate* delegate) {
764 g_external_protocol_handler_delegate = delegate; 758 g_external_protocol_handler_delegate = delegate;
765 } 759 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_tracker.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698