[subresource_filter] Update the desktop UI according to mocks

chrome/browser/ui/views/content_setting_bubble_contents.cc

Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 6d0ade5ffe0f0cbbf4fa4092130fd9b44a1151a0..85c4c221a42a642fc6c96107e8edfda75b6e2914 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -172,6 +172,7 @@ ContentSettingBubbleContents::ContentSettingBubbleContents(
       custom_link_(nullptr),
       manage_link_(nullptr),
       manage_button_(nullptr),
+      manage_checkbox_(nullptr),
       learn_more_link_(nullptr) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(
@@ -416,6 +417,16 @@ void ContentSettingBubbleContents::Init() {
     bubble_content_empty = false;
   }
 
+  if (content_setting_bubble_model_->bubble_content()

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

Use |bubble_content| here and below.

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

Done.

+          .show_manage_text_as_checkbox) {
+    manage_checkbox_ = new views::Checkbox(base::UTF8ToUTF16(
+        content_setting_bubble_model_->bubble_content().manage_text));
+    manage_checkbox_->set_listener(this);
+    layout->AddPaddingRow(0, related_control_vertical_spacing);
+    layout->StartRow(0, indented_kSingleColumnSetId);
+    layout->AddView(manage_checkbox_);
+  }
+
   if (!bubble_content_empty) {
     if (!layout_delegate->IsHarmonyMode()) {
       layout->AddPaddingRow(0, related_control_vertical_spacing);
@@ -434,6 +445,10 @@ views::View* ContentSettingBubbleContents::CreateExtraView() {
         this, base::UTF8ToUTF16(
                   content_setting_bubble_model_->bubble_content().manage_text));
     return manage_button_;
+  } else if (content_setting_bubble_model_->bubble_content()

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

No else after return here and below

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

Done.

+                 .show_manage_text_as_checkbox) {
+    // Added as part of the primary view.
+    return nullptr;
   } else {
     manage_link_ = new views::Link(base::UTF8ToUTF16(
         content_setting_bubble_model_->bubble_content().manage_text));
@@ -457,6 +472,10 @@ int ContentSettingBubbleContents::GetDialogButtons() const {
 
 base::string16 ContentSettingBubbleContents::GetDialogButtonLabel(
     ui::DialogButton button) const {
+  base::string16 done_text =

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

const &

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

Done.

+      content_setting_bubble_model_->bubble_content().done_text;
+  if (!done_text.empty())
+    return done_text;
   return l10n_util::GetStringUTF16(IDS_DONE);
 }
 
@@ -475,6 +494,8 @@ void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
   if (manage_button_ == sender) {
     GetWidget()->Close();
     content_setting_bubble_model_->OnManageLinkClicked();
+  } else if (manage_checkbox_ == sender) {
+    content_setting_bubble_model_->OnChecked(manage_checkbox_->checked());
   } else {
     RadioGroup::const_iterator i(
         std::find(radio_group_.begin(), radio_group_.end(), sender));