[subresource_filter] Update the desktop UI according to mocks

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

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..779a151c40ea79c2e0e25e2ab80642b6f61a5943 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);

[msw, 2017/04/05 22:08:33]

If this function is no longer used, and won't be imminently used, it should be
removed (along with the underlying functionality).

[Charlie Harrison, 2017/04/05 22:35:32]

Done.

+  set_show_manage_text_as_checkbox(true);
 }
 
 void ContentSettingSubresourceFilterBubbleModel::SetMessage() {
@@ -1255,11 +1255,19 @@ 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::OnChecked(bool is_checked) {
+  set_done_text(is_checked ? base::UTF8ToUTF16("Reload")

[msw, 2017/04/05 22:08:33]

q: Does this need to trigger a layout/paint of the UI with the new string? Also,
I know you asked me to ignore this placeholder string, but it'll need to be
fixed before this CL can be landed. What's blocking that?

[Charlie Harrison, 2017/04/05 22:35:32]

Yes, this needs to trigger a layout/paint of the UI with the new string. I'm not
quite sure the best way to do that. In my original message I thought maybe going
through the ContentSettingBubbleModelDelegate, but I wanted to ask your opinion
on the general approach first.

The string this needed just landed in the related Android patch (also linked
from the bug). The current PS has an updated string.

+                           : l10n_util::GetStringUTF16(IDS_DONE));
+  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*
@@ -1557,7 +1565,8 @@ ContentSettingBubbleModel::MediaMenu::~MediaMenu() {}
 ContentSettingBubbleModel::BubbleContent::BubbleContent()
     : radio_group_enabled(false),
       custom_link_enabled(false),
-      show_manage_text_as_button(false) {}
+      show_manage_text_as_button(false),
+      show_manage_text_as_checkbox(false) {}

[msw, 2017/04/05 22:08:34]

optional nit: move these default values to the struct declaration

[Charlie Harrison, 2017/04/05 22:35:32]

Done.

 
 ContentSettingBubbleModel::BubbleContent::~BubbleContent() {}