Chromium Code Reviews| Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc |
| diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc |
| index cc35f9e95562378319c5640a02b064a86e0e0cd6..a9f9979085d0a82d5e109b5eb5861bdd0cbfa197 100644 |
| --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc |
| +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc |
| @@ -1247,7 +1247,7 @@ void ContentSettingSubresourceFilterBubbleModel::SetTitle() { |
| void ContentSettingSubresourceFilterBubbleModel::SetManageText() { |
| set_manage_text( |
| l10n_util::GetStringUTF8(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD)); |
| - set_show_manage_text_as_button(true); |
| + set_show_manage_text_as_checkbox(true); |
| } |
| void ContentSettingSubresourceFilterBubbleModel::SetMessage() { |
| @@ -1255,11 +1255,21 @@ void ContentSettingSubresourceFilterBubbleModel::SetMessage() { |
| IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION)); |
| } |
| -void ContentSettingSubresourceFilterBubbleModel::OnManageLinkClicked() { |
| - subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory = |
| - subresource_filter::ContentSubresourceFilterDriverFactory:: |
| - FromWebContents(web_contents()); |
| - driver_factory->OnReloadRequested(); |
| +void ContentSettingSubresourceFilterBubbleModel::OnManageCheckboxChecked( |
| + bool is_checked) { |
| + int string_id = |
| + is_checked ? IDS_FILTERED_DECEPTIVE_CONTENT_RELOAD_ACTION : IDS_DONE; |
|
msw
2017/04/06 00:44:56
aside: It'd be nice if we could just re-use IDS_AP
Charlie Harrison
2017/04/06 02:04:58
OK, I was not sure of the best practice here, cons
msw
2017/04/06 02:19:29
Generally, it's good to reuse and consolidate stri
|
| + set_done_button_text(l10n_util::GetStringUTF16(string_id)); |
| + is_checked_ = is_checked; |
| +} |
| + |
| +void ContentSettingSubresourceFilterBubbleModel::OnDoneClicked() { |
| + if (is_checked_) { |
| + subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory = |
| + subresource_filter::ContentSubresourceFilterDriverFactory:: |
| + FromWebContents(web_contents()); |
| + driver_factory->OnReloadRequested(); |
| + } |
| } |
| ContentSettingSubresourceFilterBubbleModel* |
| @@ -1554,10 +1564,7 @@ ContentSettingBubbleModel::MediaMenu::MediaMenu(const MediaMenu& other) = |
| ContentSettingBubbleModel::MediaMenu::~MediaMenu() {} |
| -ContentSettingBubbleModel::BubbleContent::BubbleContent() |
| - : radio_group_enabled(false), |
| - custom_link_enabled(false), |
| - show_manage_text_as_button(false) {} |
| +ContentSettingBubbleModel::BubbleContent::BubbleContent() {} |
| ContentSettingBubbleModel::BubbleContent::~BubbleContent() {} |