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

Unified Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 2374443003: Fix content settings's cookie code to work with PlzNavigate. (Closed)
Patch Set: review comments Created 4 years, 3 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/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 64af726ee1c15390bf59ef79f0975119ad624de6..f981c266a3e50c10151431648c0635fe407846d8 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -425,14 +425,12 @@ bool ChromeNetworkDelegate::OnCanGetCookies(
bool allow = cookie_settings_->IsReadingCookieAllowed(
request.url(), request.first_party_for_cookies());
- int render_process_id = -1;
- int render_frame_id = -1;
- if (content::ResourceRequestInfo::GetRenderFrameForRequest(
- &request, &render_process_id, &render_frame_id)) {
+ const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
+ if (info) {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&TabSpecificContentSettings::CookiesRead,
- render_process_id, render_frame_id,
+ info->GetWebContentsGetterForRequest(),
request.url(), request.first_party_for_cookies(),
cookie_list, !allow));
}
@@ -450,14 +448,12 @@ bool ChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
bool allow = cookie_settings_->IsSettingCookieAllowed(
request.url(), request.first_party_for_cookies());
- int render_process_id = -1;
- int render_frame_id = -1;
- if (content::ResourceRequestInfo::GetRenderFrameForRequest(
- &request, &render_process_id, &render_frame_id)) {
+ const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
+ if (info) {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&TabSpecificContentSettings::CookieChanged,
- render_process_id, render_frame_id,
+ info->GetWebContentsGetterForRequest(),
request.url(), request.first_party_for_cookies(),
cookie_line, *options, !allow));
}

Powered by Google App Engine
This is Rietveld 408576698