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

Unified Diff: chrome/browser/cocoa/content_settings_dialog_controller.mm

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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/content_settings_dialog_controller.mm
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm
index 631e9272641d21ce4a43d03cd0dabb409f03cb0b..d98948d73a2b592b91daea29c720964436a63743 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm
@@ -234,7 +234,6 @@ class PrefObserverDisabler {
ContentSetting setting = CONTENT_SETTING_DEFAULT;
switch (value) {
case kCookieEnabledIndex: setting = CONTENT_SETTING_ALLOW; break;
- case kCookieAskIndex: setting = CONTENT_SETTING_ASK; break;
case kCookieDisabledIndex: setting = CONTENT_SETTING_BLOCK; break;
default:
NOTREACHED();
@@ -249,9 +248,8 @@ class PrefObserverDisabler {
- (NSInteger)cookieSettingIndex {
switch (profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
CONTENT_SETTINGS_TYPE_COOKIES)) {
- case CONTENT_SETTING_ALLOW: return kCookieEnabledIndex;
- case CONTENT_SETTING_ASK: return kCookieAskIndex;
- case CONTENT_SETTING_BLOCK: return kCookieDisabledIndex;
+ case CONTENT_SETTING_ALLOW: return kCookieEnabledIndex;
+ case CONTENT_SETTING_BLOCK: return kCookieDisabledIndex;
default:
NOTREACHED();
return kCookieEnabledIndex;

Powered by Google App Engine
This is Rietveld 408576698