summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-02 12:09:35 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-02 12:09:35 +0000
commitdcfb5c0db3c898441e6d1e1f38781a488816a0e4 (patch)
treea446debcf6430918e63ae049e46fbbb220274558 /chrome/browser/cocoa
parenta40c8dbc97b4a8f8499b703300da65fe053e95c2 (diff)
downloadchromium_src-dcfb5c0db3c898441e6d1e1f38781a488816a0e4.zip
chromium_src-dcfb5c0db3c898441e6d1e1f38781a488816a0e4.tar.gz
chromium_src-dcfb5c0db3c898441e6d1e1f38781a488816a0e4.tar.bz2
Add a "session only" policy to the content settings.
session only is treated as allow, but the cookies will expire after this session (the actual code to expire non-html cookies will follow). BUG=47049 TEST=none Review URL: http://codereview.chromium.org/2858018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/content_exceptions_window_controller.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.mm b/chrome/browser/cocoa/content_exceptions_window_controller.mm
index 692fe86..dd7bd55 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.mm
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.mm
@@ -130,6 +130,7 @@ const ContentSetting kNoAskSettings[] = { CONTENT_SETTING_ALLOW,
// The settings shown in the combobox if showAsk_ is true;
const ContentSetting kAskSettings[] = { CONTENT_SETTING_ALLOW,
CONTENT_SETTING_ASK,
+ CONTENT_SETTING_SESSION_ONLY,
CONTENT_SETTING_BLOCK };
} // namespace
@@ -504,6 +505,9 @@ static ContentExceptionsWindowController*
return l10n_util::GetNSStringWithFixup(IDS_EXCEPTIONS_BLOCK_BUTTON);
case CONTENT_SETTING_ASK:
return l10n_util::GetNSStringWithFixup(IDS_EXCEPTIONS_ASK_BUTTON);
+ case CONTENT_SETTING_SESSION_ONLY:
+ return l10n_util::GetNSStringWithFixup(
+ IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
default:
NOTREACHED();
}