| 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 9dd655033b44a5f98ba6447cb7444ef17703eefb..cfe07d0dff1de4389a390a5ef045e5d54cc5e01d 100644
|
| --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| @@ -261,7 +261,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,
|
| @@ -271,7 +272,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
|
|
|