From eee3452dafdca8a97fa73ea466b6621dcff77238 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Wed, 14 Jul 2010 08:15:48 +0000 Subject: 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 --- chrome/browser/dom_ui/content_settings_handler.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'chrome/browser/dom_ui') 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", -- cgit v1.1