summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_exceptions_table_model.cc
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/content_exceptions_table_model.cc
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/content_exceptions_table_model.cc')
-rw-r--r--chrome/browser/content_exceptions_table_model.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc
index d7f1bb6..d149a6d 100644
--- a/chrome/browser/content_exceptions_table_model.cc
+++ b/chrome/browser/content_exceptions_table_model.cc
@@ -99,8 +99,6 @@ std::wstring ContentExceptionsTableModel::GetText(int row, int column_id) {
return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON);
case CONTENT_SETTING_BLOCK:
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: