Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(714)

Unified Diff: chrome/browser/content_setting_combo_model.cc

Issue 2858018: Add a "session only" policy to the content settings. (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/content_exceptions_table_model.cc ('k') | chrome/browser/cookie_modal_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_setting_combo_model.cc
diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/content_setting_combo_model.cc
index e37c151a8a6cb5aecad56e04bfaed72a3902d915..c6e990ef8c6fe90f486d9adc95053bd5633f02fb 100644
--- a/chrome/browser/content_setting_combo_model.cc
+++ b/chrome/browser/content_setting_combo_model.cc
@@ -16,6 +16,7 @@ const ContentSetting kNoAskSettings[] = { CONTENT_SETTING_ALLOW,
// The settings shown in the combobox if show_ask_ is true;
const ContentSetting kAskSettings[] = { CONTENT_SETTING_ALLOW,
CONTENT_SETTING_ASK,
+ CONTENT_SETTING_SESSION_ONLY,
CONTENT_SETTING_BLOCK };
} // namespace
@@ -39,6 +40,8 @@ std::wstring ContentSettingComboModel::GetItemAt(int index) {
return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON);
case CONTENT_SETTING_ASK:
return l10n_util::GetString(IDS_EXCEPTIONS_ASK_BUTTON);
+ case CONTENT_SETTING_SESSION_ONLY:
+ return l10n_util::GetString(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
default:
NOTREACHED();
}
« no previous file with comments | « chrome/browser/content_exceptions_table_model.cc ('k') | chrome/browser/cookie_modal_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698