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

Unified Diff: content/browser/renderer_host/render_message_filter.cc

Issue 6749044: Remove async functionality from net::CookiePolicy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 8 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_impl_io_data.cc ('k') | net/base/cookie_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index c90157a057a672f574853fe641c1392fc323b7ef..016cc180eacc8908a4f9e2ab2c65497ab3482449 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -456,9 +456,7 @@ void RenderMessageFilter::OnSetCookie(const IPC::Message& message,
int policy = net::OK;
if (context->cookie_policy()) {
policy = context->cookie_policy()->CanSetCookie(
- url, first_party_for_cookies, cookie, callback);
- if (policy == net::ERR_IO_PENDING)
- return;
+ url, first_party_for_cookies, cookie);
}
callback->Run(policy);
}
@@ -479,11 +477,7 @@ void RenderMessageFilter::OnGetCookies(const GURL& url,
int policy = net::OK;
if (context->cookie_policy()) {
policy = context->cookie_policy()->CanGetCookies(
- url, first_party_for_cookies, callback);
- if (policy == net::ERR_IO_PENDING) {
- Send(new ViewMsg_SignalCookiePromptEvent());
- return;
- }
+ url, first_party_for_cookies);
}
callback->Run(policy);
}
@@ -519,11 +513,7 @@ void RenderMessageFilter::OnGetRawCookies(
int policy = net::OK;
if (context->cookie_policy()) {
policy = context->cookie_policy()->CanGetCookies(
- url, first_party_for_cookies, callback);
- if (policy == net::ERR_IO_PENDING) {
- Send(new ViewMsg_SignalCookiePromptEvent());
- return;
- }
+ url, first_party_for_cookies);
}
callback->Run(policy);
}
@@ -547,11 +537,7 @@ void RenderMessageFilter::OnCookiesEnabled(
// host.
if (context->cookie_policy()) {
policy = context->cookie_policy()->CanGetCookies(
- url, first_party_for_cookies, callback);
- if (policy == net::ERR_IO_PENDING) {
- Send(new ViewMsg_SignalCookiePromptEvent());
- return; // CanGetCookies will call our callback in this case.
- }
+ url, first_party_for_cookies);
}
callback->Run(policy);
}
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | net/base/cookie_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698