summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 08:15:48 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 08:15:48 +0000
commiteee3452dafdca8a97fa73ea466b6621dcff77238 (patch)
treee60c0062aa9768c4314c42f85ec42aedafbc04a9 /chrome/browser/dom_ui
parentfec862637c99eff80e18a8769c0900f65d9d2d27 (diff)
downloadchromium_src-eee3452dafdca8a97fa73ea466b6621dcff77238.zip
chromium_src-eee3452dafdca8a97fa73ea466b6621dcff77238.tar.gz
chromium_src-eee3452dafdca8a97fa73ea466b6621dcff77238.tar.bz2
Remove the cookie prompt from the settings UI and migrate prefs from ask to block.
BUG=48941 TEST=none Review URL: http://codereview.chromium.org/2963006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/content_settings_handler.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/content_settings_handler.cc b/chrome/browser/dom_ui/content_settings_handler.cc
index db59df4..c89fac3 100644
--- a/chrome/browser/dom_ui/content_settings_handler.cc
+++ b/chrome/browser/dom_ui/content_settings_handler.cc
@@ -63,8 +63,6 @@ std::string ContentSettingToString(ContentSetting setting) {
switch (setting) {
case CONTENT_SETTING_ALLOW:
return "allow";
- case CONTENT_SETTING_ASK:
- return "ask";
case CONTENT_SETTING_BLOCK:
return "block";
@@ -77,8 +75,6 @@ std::string ContentSettingToString(ContentSetting setting) {
ContentSetting ContentSettingFromString(const std::string& name) {
if (name == "allow")
return CONTENT_SETTING_ALLOW;
- if (name == "ask")
- return CONTENT_SETTING_ASK;
if (name == "block")
return CONTENT_SETTING_BLOCK;
@@ -110,8 +106,6 @@ void ContentSettingsHandler::GetLocalizedValues(
l10n_util::GetString(IDS_MODIFY_COOKIE_STORING_LABEL));
localized_strings->SetString(L"cookies_allow",
l10n_util::GetString(IDS_COOKIES_ALLOW_RADIO));
- localized_strings->SetString(L"cookies_ask",
- l10n_util::GetString(IDS_COOKIES_ASK_EVERY_TIME_RADIO));
localized_strings->SetString(L"cookies_block",
l10n_util::GetString(IDS_COOKIES_BLOCK_RADIO));
localized_strings->SetString(L"cookies_block_3rd_party",