From 19ffb7df15fbe0e68f9af32fd8f049a6f38b5ba7 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Wed, 18 Aug 2010 07:17:09 +0000 Subject: Don't claim we would always block cookies, since there are always exceptions. BUG=none TEST=none Review URL: http://codereview.chromium.org/3158016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56491 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/net/chrome_url_request_context.cc | 7 ------- chrome/browser/net/chrome_url_request_context.h | 3 --- chrome/browser/renderer_host/resource_message_filter.cc | 8 -------- chrome/browser/renderer_host/resource_message_filter.h | 3 --- chrome/common/render_messages_internal.h | 6 ------ chrome/renderer/renderer_webcookiejar_impl.cc | 8 -------- chrome/renderer/renderer_webcookiejar_impl.h | 2 -- 7 files changed, 37 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 5d818ee..7c5031f 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -863,13 +863,6 @@ void ChromeURLRequestContext::OnUnloadedExtension(const std::string& id) { } } -bool ChromeURLRequestContext::AreCookiesEnabled() const { - ContentSetting setting = - host_content_settings_map_->GetDefaultContentSetting( - CONTENT_SETTINGS_TYPE_COOKIES); - return setting != CONTENT_SETTING_BLOCK; -} - ChromeURLRequestContext::ChromeURLRequestContext( ChromeURLRequestContext* other) { CheckCurrentlyOnIOThread(); diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h index 06c2b80..f64700c 100644 --- a/chrome/browser/net/chrome_url_request_context.h +++ b/chrome/browser/net/chrome_url_request_context.h @@ -133,9 +133,6 @@ class ChromeURLRequestContext : public URLRequestContext { // Callback for when an extension is unloaded. void OnUnloadedExtension(const std::string& id); - // False only if cookies are globally blocked without exception. - bool AreCookiesEnabled() const; - // Returns true if this context is an external request context, like // ChromeFrame. virtual bool IsExternal() const { diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 70e75d4..87f4cff 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -370,7 +370,6 @@ bool ResourceMessageFilter::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetRawCookies, OnGetRawCookies) IPC_MESSAGE_HANDLER(ViewHostMsg_DeleteCookie, OnDeleteCookie) - IPC_MESSAGE_HANDLER(ViewHostMsg_GetCookiesEnabled, OnGetCookiesEnabled) #if defined(OS_MACOSX) IPC_MESSAGE_HANDLER(ViewHostMsg_LoadFont, OnLoadFont) #endif @@ -660,13 +659,6 @@ void ResourceMessageFilter::OnDeleteCookie(const GURL& url, context->cookie_store()->DeleteCookie(url, cookie_name); } -void ResourceMessageFilter::OnGetCookiesEnabled( - const GURL& url, - const GURL& first_party_for_cookies, - bool* enabled) { - *enabled = GetRequestContextForURL(url)->AreCookiesEnabled(); -} - #if defined(OS_MACOSX) void ResourceMessageFilter::OnLoadFont(const FontDescriptor& font, uint32* handle_size, diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 04b1728..87bd886 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -153,9 +153,6 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter, IPC::Message* reply_msg); void OnDeleteCookie(const GURL& url, const std::string& cookieName); - void OnGetCookiesEnabled(const GURL& url, - const GURL& first_party_for_cookies, - bool* enabled); void OnPluginFileDialog(const IPC::Message& msg, bool multiple_files, const std::wstring& title, diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 4aeb137..ba858bf 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -1255,12 +1255,6 @@ IPC_BEGIN_MESSAGES(ViewHost) GURL /* url */, std::string /* cookie_name */) - // Used to get raw cookie information for the given URL - IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_GetCookiesEnabled, - GURL /* url */, - GURL /* first_party_for_cookies */, - bool /* enabled */) - // Used to get the list of plugins IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetPlugins, bool /* refresh*/, diff --git a/chrome/renderer/renderer_webcookiejar_impl.cc b/chrome/renderer/renderer_webcookiejar_impl.cc index 711338b..a8466ae 100644 --- a/chrome/renderer/renderer_webcookiejar_impl.cc +++ b/chrome/renderer/renderer_webcookiejar_impl.cc @@ -67,11 +67,3 @@ void RendererWebCookieJarImpl::deleteCookie( UTF16ToUTF8(cookie_name.data(), cookie_name.length(), &cookie_name_utf8); sender_->Send(new ViewHostMsg_DeleteCookie(url, cookie_name_utf8)); } - -bool RendererWebCookieJarImpl::cookiesEnabled( - const WebURL& url, const WebURL& first_party_for_cookies) { - bool enabled; - sender_->Send(new ViewHostMsg_GetCookiesEnabled( - url, first_party_for_cookies, &enabled)); - return enabled; -} diff --git a/chrome/renderer/renderer_webcookiejar_impl.h b/chrome/renderer/renderer_webcookiejar_impl.h index f004bed..ce57e54 100644 --- a/chrome/renderer/renderer_webcookiejar_impl.h +++ b/chrome/renderer/renderer_webcookiejar_impl.h @@ -36,8 +36,6 @@ class RendererWebCookieJarImpl : public WebKit::WebCookieJar { WebKit::WebVector& cookies); virtual void deleteCookie( const WebKit::WebURL& url, const WebKit::WebString& cookie_name); - virtual bool cookiesEnabled( - const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies); IPC::Message::Sender* sender_; }; -- cgit v1.1