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

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

Issue 12256046: Added interstitial page for merge session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 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 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
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.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