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 a1ae82040d728119c44c4a54fbdc421a7249d0d6..96e866ba24d50bc191cde8b60f3e89dba0dec9a7 100644 |
--- a/chrome/browser/renderer_host/resource_message_filter.cc |
+++ b/chrome/browser/renderer_host/resource_message_filter.cc |
@@ -687,7 +687,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, |
@@ -1773,7 +1773,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), |
@@ -1795,6 +1795,14 @@ 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()) { |
darin (slow to review)
2010/11/30 18:24:11
Do you care about the case where ResourceMessageFi
jochen (gone - plz use gerrit)
2010/12/03 16:02:32
this block is inside an if (!raw_cookies_) (see ab
|
+ net::CookieMonster* cookie_monster = |
+ context_->cookie_store()->GetCookieMonster(); |
+ CallRenderViewHostContentSettingsDelegate( |
+ render_process_id_, render_view_id_, |
+ &RenderViewHostDelegate::ContentSettings::OnCookiesRead, |
+ url_, cookie_monster, net::CookieOptions(), result != net::OK); |
+ } |
delete this; |
} else { |
// Ignore the policy result. We only waited on the policy result so that |