| Index: chrome/browser/gtk/options/cookie_filter_page_gtk.cc
|
| diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
|
| index fbe7a9252d3f3b65336f512af8701b5b7591c56b..878fdd0bbb3bd2ad8218cfb7bd2992811c0a0afe 100644
|
| --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
|
| +++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
|
| @@ -72,13 +72,6 @@ GtkWidget* CookieFilterPageGtk::InitCookieStoringGroup() {
|
| G_CALLBACK(OnCookiesAllowToggledThunk), this);
|
| gtk_box_pack_start(GTK_BOX(vbox), allow_radio_, FALSE, FALSE, 0);
|
|
|
| - ask_every_time_radio_ = gtk_radio_button_new_with_label_from_widget(
|
| - GTK_RADIO_BUTTON(allow_radio_),
|
| - l10n_util::GetStringUTF8(IDS_COOKIES_ASK_EVERY_TIME_RADIO).c_str());
|
| - g_signal_connect(G_OBJECT(ask_every_time_radio_), "toggled",
|
| - G_CALLBACK(OnCookiesAllowToggledThunk), this);
|
| - gtk_box_pack_start(GTK_BOX(vbox), ask_every_time_radio_, FALSE, FALSE, 0);
|
| -
|
| block_radio_ = gtk_radio_button_new_with_label_from_widget(
|
| GTK_RADIO_BUTTON(allow_radio_),
|
| l10n_util::GetStringUTF8(IDS_COOKIES_BLOCK_RADIO).c_str());
|
| @@ -96,11 +89,9 @@ GtkWidget* CookieFilterPageGtk::InitCookieStoringGroup() {
|
| GtkWidget* radio_button = NULL;
|
| if (default_setting == CONTENT_SETTING_ALLOW) {
|
| radio_button = allow_radio_;
|
| - } else if (default_setting == CONTENT_SETTING_BLOCK) {
|
| - radio_button = block_radio_;
|
| } else {
|
| - DCHECK(default_setting == CONTENT_SETTING_ASK);
|
| - radio_button = ask_every_time_radio_;
|
| + DCHECK(default_setting == CONTENT_SETTING_BLOCK);
|
| + radio_button = block_radio_;
|
| }
|
| gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE);
|
|
|
| @@ -157,8 +148,6 @@ void CookieFilterPageGtk::OnCookiesAllowToggled(GtkWidget* toggle_button) {
|
| ContentSetting setting = CONTENT_SETTING_ALLOW;
|
| if (toggle_button == allow_radio_)
|
| setting = CONTENT_SETTING_ALLOW;
|
| - else if (toggle_button == ask_every_time_radio_)
|
| - setting = CONTENT_SETTING_ASK;
|
| else if (toggle_button == block_radio_)
|
| setting = CONTENT_SETTING_BLOCK;
|
|
|
|
|