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

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

Issue 11938007: Don't use request user data during one-click sign in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/ui/sync/one_click_signin_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1128b529bf06fa8799ef2c57bc29d29abd533cae..423a7f8f5c32dcc81f43b14a31f792c810dc8c31 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -399,11 +399,14 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
AutoLoginPrompter::ShowInfoBarIfPossible(request, info->GetChildID(),
info->GetRouteID());
+ ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
+
#if defined(ENABLE_ONE_CLICK_SIGNIN)
// See if the response contains the Google-Accounts-SignIn header. If so,
// then the user has just finished signing in, and the server is allowing the
// browser to suggest connecting the user's profile to the account.
- OneClickSigninHelper::ShowInfoBarIfPossible(request, info->GetChildID(),
+ OneClickSigninHelper::ShowInfoBarIfPossible(request, io_data,
+ info->GetChildID(),
info->GetRouteID());
#endif
@@ -418,7 +421,6 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
}
}
- ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
if (io_data->resource_prefetch_predictor_observer())
io_data->resource_prefetch_predictor_observer()->OnResponseStarted(request);
@@ -432,6 +434,8 @@ void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
content::ResourceResponse* response) {
LoadTimingObserver::PopulateTimingInfo(request, response);
+ ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
+
#if defined(ENABLE_ONE_CLICK_SIGNIN)
const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
@@ -440,11 +444,11 @@ void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
// See if the response contains the Google-Accounts-SignIn header. If so,
// then the user has just finished signing in, and the server is allowing the
// browser to suggest connecting the user's profile to the account.
- OneClickSigninHelper::ShowInfoBarIfPossible(request, info->GetChildID(),
+ OneClickSigninHelper::ShowInfoBarIfPossible(request, io_data,
+ info->GetChildID(),
info->GetRouteID());
#endif
- ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
if (io_data->resource_prefetch_predictor_observer()) {
io_data->resource_prefetch_predictor_observer()->OnRequestRedirected(
redirect_url, request);
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/ui/sync/one_click_signin_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698