chrome/browser/content_exceptions_table_model.cc - Issue 2963006: Remove the cookie prompt from the settings UI and migrate prefs from ask to block.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_exceptions_table_model.cc

Issue 2963006: Remove the cookie prompt from the settings UI and migrate prefs from ask to block. (Closed)

Patch Set: updates Created 10 years, 5 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:

Index: chrome/browser/content_exceptions_table_model.cc

diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc

index d7f1bb6fa8c80d23e449bac43336809113bbf44c..d149a6dab168c0e970019f8bb461b2847de880a8 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: