diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 11:38:43 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 11:38:43 +0000 |
| commit | fd473d1355ca1783fd22ecc32262cb12780ccccd (patch) | |
| tree | 7fcc633147fc12773e81589acb47154032c9995e /chrome/browser/content_settings/tab_specific_content_settings.cc | |
| parent | 6414637c3930b984aa620c2c8f167480d31adceb (diff) | |
| download | chromium_src-fd473d1355ca1783fd22ecc32262cb12780ccccd.zip chromium_src-fd473d1355ca1783fd22ecc32262cb12780ccccd.tar.gz chromium_src-fd473d1355ca1783fd22ecc32262cb12780ccccd.tar.bz2 | |
In addition to the request URL we now also pass the first party URL (the URL of the Omnibox) to the TabSpecificContentSettings whenever cookies are read or changed.
BUG=113688
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9977002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/tab_specific_content_settings.cc')
| -rw-r--r-- | chrome/browser/content_settings/tab_specific_content_settings.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 80d9cfa..0badb8b 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -88,11 +88,14 @@ TabSpecificContentSettings* TabSpecificContentSettings::Get( void TabSpecificContentSettings::CookiesRead(int render_process_id, int render_view_id, const GURL& url, + const GURL& first_party_url, const net::CookieList& cookie_list, bool blocked_by_policy) { TabSpecificContentSettings* settings = Get(render_process_id, render_view_id); - if (settings) - settings->OnCookiesRead(url, cookie_list, blocked_by_policy); + if (settings) { + settings->OnCookiesRead(url, first_party_url, cookie_list, + blocked_by_policy); + } } // static @@ -100,12 +103,14 @@ void TabSpecificContentSettings::CookieChanged( int render_process_id, int render_view_id, const GURL& url, + const GURL& first_party_url, const std::string& cookie_line, const net::CookieOptions& options, bool blocked_by_policy) { TabSpecificContentSettings* settings = Get(render_process_id, render_view_id); if (settings) - settings->OnCookieChanged(url, cookie_line, options, blocked_by_policy); + settings->OnCookieChanged(url, first_party_url, cookie_line, options, + blocked_by_policy); } // static @@ -250,6 +255,7 @@ void TabSpecificContentSettings::OnContentAccessed(ContentSettingsType type) { void TabSpecificContentSettings::OnCookiesRead( const GURL& url, + const GURL& first_party_url, const net::CookieList& cookie_list, bool blocked_by_policy) { if (cookie_list.empty()) @@ -267,6 +273,7 @@ void TabSpecificContentSettings::OnCookiesRead( void TabSpecificContentSettings::OnCookieChanged( const GURL& url, + const GURL& first_party_url, const std::string& cookie_line, const net::CookieOptions& options, bool blocked_by_policy) { |