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

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

Issue 5318002: Also register read cookies in the content settings delegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 10 years 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/resource_message_filter.cc
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 37a44d5ed1350e26b3648f516ab770162093e71d..142fac3ea035f141d0be98bddc8fece28c70642d 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -675,7 +675,7 @@ void ResourceMessageFilter::OnSetCookie(const IPC::Message& message,
void ResourceMessageFilter::OnGetCookies(const GURL& url,
const GURL& first_party_for_cookies,
IPC::Message* reply_msg) {
- URLRequestContext* context = GetRequestContextForURL(url);
+ ChromeURLRequestContext* context = GetRequestContextForURL(url);
GetCookiesCompletion* callback =
new GetCookiesCompletion(id(), reply_msg->routing_id(), url, reply_msg,
@@ -1754,7 +1754,7 @@ void SetCookieCompletion::RunWithParams(const Tuple1<int>& params) {
if (!context_->IsExternal()) {
CallRenderViewHostContentSettingsDelegate(
render_process_id_, render_view_id_,
- &RenderViewHostDelegate::ContentSettings::OnCookieAccessed,
+ &RenderViewHostDelegate::ContentSettings::OnCookieChanged,
url_, cookie_line_, options, blocked_by_policy);
}
delete this;
@@ -1765,7 +1765,7 @@ GetCookiesCompletion::GetCookiesCompletion(int render_process_id,
const GURL& url,
IPC::Message* reply_msg,
ResourceMessageFilter* filter,
- URLRequestContext* context,
+ ChromeURLRequestContext* context,
bool raw_cookies)
: url_(url),
reply_msg_(reply_msg),
@@ -1787,6 +1787,17 @@ void GetCookiesCompletion::RunWithParams(const Tuple1<int>& params) {
cookies = cookie_store()->GetCookies(url_);
ViewHostMsg_GetCookies::WriteReplyParams(reply_msg_, cookies);
filter_->Send(reply_msg_);
+ if (!context_->IsExternal()) {
+ net::CookieMonster* cookie_monster =
+ context_->cookie_store()->GetCookieMonster();
+ net::CookieList cookie_list =
+ cookie_monster->GetAllCookiesForURLWithOptions(
+ url_, net::CookieOptions());
+ CallRenderViewHostContentSettingsDelegate(
+ render_process_id_, render_view_id_,
+ &RenderViewHostDelegate::ContentSettings::OnCookiesRead,
+ url_, cookie_list, result != net::OK);
+ }
delete this;
} else {
// Ignore the policy result. We only waited on the policy result so that

Powered by Google App Engine
This is Rietveld 408576698