| 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 bf74c49c721d55c63148b6fbb5884d63ef83a0c3..d35292bcc46f31dd51a37ac9159a77b6fe874b59 100644
|
| --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
|
| @@ -60,6 +60,7 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/extensions/file_browser_resource_throttle.h"
|
| +#include "chrome/browser/chromeos/login/merge_session_throttle.h"
|
| // TODO(oshima): Enable this for other platforms.
|
| #include "chrome/browser/renderer_host/offline_resource_throttle.h"
|
| #endif
|
| @@ -162,6 +163,11 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
|
| // block unsafe site after we remove offline page.
|
| throttles->push_back(new OfflineResourceThrottle(
|
| child_id, route_id, request, appcache_service));
|
| + // Add interstitial page while merge session process (cookie
|
| + // reconstruction from OAuth2 refresh token in ChromeOS login) is still in
|
| + // progress while we are attempting to load a google property.
|
| + throttles->push_back(new MergeSessionThrottle(
|
| + child_id, route_id, request));
|
| }
|
| #endif
|
|
|
|
|