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

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 118733002: Added merge session request throttle for XHR requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 83936591b948e45115155f8325681eaafe2cfd28..9eb0e0e6e917a0abf16108493b8e3237dcdbaf37 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -269,7 +269,8 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
}
#if defined(OS_CHROMEOS)
- if (resource_type == ResourceType::MAIN_FRAME) {
+ if (resource_type == ResourceType::MAIN_FRAME ||
+ resource_type == ResourceType::XHR) {
// We check offline first, then check safe browsing so that we still can
// block unsafe site after we remove offline page.
throttles->push_back(new OfflineResourceThrottle(request,
@@ -279,7 +280,7 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
// progress while we are attempting to load a google property.
if (!MergeSessionThrottle::AreAllSessionMergedAlready() &&
request->url().SchemeIsHTTPOrHTTPS()) {
- throttles->push_back(new MergeSessionThrottle(request));
+ throttles->push_back(new MergeSessionThrottle(request, resource_type));
}
}
#endif
« no previous file with comments | « chrome/browser/chromeos/login/oobe_base_test.cc ('k') | chrome/browser/resources/chromeos/merge_session_load.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698