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

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 2793413002: [subresource_filter] Update the desktop UI according to mocks (Closed)
Patch Set: engedy review Created 3 years, 8 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/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..9983e5c2d586b3638f59efb820dc109cd44283ec 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,22 @@ 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) {
+ if (is_checked)
+ set_done_button_text(l10n_util::GetStringUTF16(IDS_APP_MENU_RELOAD));
+ else
+ set_done_button_text(base::string16());
+ 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 +1565,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() {}

Powered by Google App Engine
This is Rietveld 408576698