diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 15:29:17 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 15:29:17 +0000 |
| commit | bd14784bcadf8cf55ae92e713a2545245bb02826 (patch) | |
| tree | 7cf74d7dfa33e0dd46f4c0b0e32d788f53143e29 /chrome/browser/cookie_modal_dialog.cc | |
| parent | 94d2c4067766e532bfd7b61a9b7f0a0616325642 (diff) | |
| download | chromium_src-bd14784bcadf8cf55ae92e713a2545245bb02826.zip chromium_src-bd14784bcadf8cf55ae92e713a2545245bb02826.tar.gz chromium_src-bd14784bcadf8cf55ae92e713a2545245bb02826.tar.bz2 | |
Disable remember option in cookie prompt and content blocked notification bubbles when running OTR.
BUG=37525
TEST=Manual, check cookie prompt and bubbles in OTR session
Review URL: http://codereview.chromium.org/1629011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cookie_modal_dialog.cc')
| -rw-r--r-- | chrome/browser/cookie_modal_dialog.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/cookie_modal_dialog.cc b/chrome/browser/cookie_modal_dialog.cc index 1e1526c..0135fad 100644 --- a/chrome/browser/cookie_modal_dialog.cc +++ b/chrome/browser/cookie_modal_dialog.cc @@ -99,7 +99,8 @@ bool CookiePromptModalDialog::IsValid() { void CookiePromptModalDialog::AllowSiteData(bool remember, bool session_expire) { - if (remember) { + DCHECK(!remember || DecisionPersistable()); + if (remember && DecisionPersistable()) { host_content_settings_map_->SetContentSetting( HostContentSettingsMap::Pattern::FromURL(origin_), CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_ALLOW); @@ -112,7 +113,8 @@ void CookiePromptModalDialog::AllowSiteData(bool remember, } void CookiePromptModalDialog::BlockSiteData(bool remember) { - if (remember) { + DCHECK(!remember || DecisionPersistable()); + if (remember && DecisionPersistable()) { host_content_settings_map_->SetContentSetting( HostContentSettingsMap::Pattern::FromURL(origin_), CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); @@ -134,3 +136,7 @@ int CookiePromptModalDialog::GetDialogButtons() { return MessageBoxFlags::DIALOGBUTTON_OK | MessageBoxFlags::DIALOGBUTTON_CANCEL; } + +bool CookiePromptModalDialog::DecisionPersistable() { + return !host_content_settings_map_->IsOffTheRecord(); +} |