diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 08:33:41 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 08:33:41 +0000 |
| commit | da4f8a1a589ef8737296d69049a4977bc1fc37a0 (patch) | |
| tree | 2c877d758b9ae6d48e147777af95a5720229df96 /chrome/browser/tab_contents/tab_contents.cc | |
| parent | 145ee1d1d068a99db00aa1799f84645a6a6b9eec (diff) | |
| download | chromium_src-da4f8a1a589ef8737296d69049a4977bc1fc37a0.zip chromium_src-da4f8a1a589ef8737296d69049a4977bc1fc37a0.tar.gz chromium_src-da4f8a1a589ef8737296d69049a4977bc1fc37a0.tar.bz2 | |
Clear cookie related settings at the beginning of a navigation instead of at the end.
BUG=none
TEST=TabSpecific*.*
Review URL: http://codereview.chromium.org/3194005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.cc')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 9ee487b..2386994 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -1625,7 +1625,7 @@ void TabContents::DidNavigateMainFramePostCommit( } // Clear "blocked" flags. - content_settings_delegate_->ClearBlockedContentSettings(); + content_settings_delegate_->ClearBlockedContentSettingsExceptForCookies(); content_settings_delegate_->GeolocationDidNavigate(details); // Once the main frame is navigated, we're no longer considered to have @@ -2065,6 +2065,8 @@ void TabContents::DidStartProvisionalLoadForFrame( NotificationType::FRAME_PROVISIONAL_LOAD_START, Source<NavigationController>(&controller_), Details<ProvisionalLoadDetails>(&details)); + if (is_main_frame) + content_settings_delegate_->ClearCookieSpecificContentSettings(); } void TabContents::DidStartReceivingResourceResponse( |