[subresource_filter] Update the desktop UI according to mocks

chrome/browser/ui/views/content_setting_bubble_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 16 matching lines @@
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/default_style.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/md_text_button.h"

[msw, 2017/04/06 00:44:56]

nit: remove if no longer needed

[Charlie Harrison, 2017/04/06 02:04:58]

Done.

 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 116 matching lines @@
 ContentSettingBubbleContents::ContentSettingBubbleContents(
     ContentSettingBubbleModel* content_setting_bubble_model,
     content::WebContents* web_contents,
     views::View* anchor_view,
     views::BubbleBorder::Arrow arrow)
     : content::WebContentsObserver(web_contents),
       BubbleDialogDelegateView(anchor_view, arrow),
       content_setting_bubble_model_(content_setting_bubble_model),
       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(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 }
 
 ContentSettingBubbleContents::~ContentSettingBubbleContents() {
   // Must remove the children here so the comboboxes get destroyed before
   // their associated models.
   RemoveAllChildViews(true);
@@ skipping 224 matching lines @@
         new views::Link(base::UTF8ToUTF16(bubble_content.custom_link));
     custom_link_->SetEnabled(bubble_content.custom_link_enabled);
     custom_link_->set_listener(this);
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, related_control_vertical_spacing);
     layout->StartRow(0, kSingleColumnSetId);
     layout->AddView(custom_link_);
     bubble_content_empty = false;
   }
 
+  if (bubble_content.show_manage_text_as_checkbox) {
+    manage_checkbox_ =
+        new views::Checkbox(base::UTF8ToUTF16(bubble_content.manage_text));

[msw, 2017/04/06 00:44:56]

aside: BubbleContent::manage_text should probably be a string16.

[Charlie Harrison, 2017/04/06 02:04:58]

Ack. Let's address this in a followup?

[msw, 2017/04/06 02:19:29]

Acknowledged.

+    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);
       layout->StartRow(0, kSingleColumnSetId);
       layout->AddView(new views::Separator(), 1, 1, GridLayout::FILL,
                       GridLayout::FILL);
     }
     layout->AddPaddingRow(0, related_control_vertical_spacing);
   }
 }
 
 views::View* ContentSettingBubbleContents::CreateExtraView() {
-  if (content_setting_bubble_model_->bubble_content()
-          .show_manage_text_as_button) {
-    manage_button_ = views::MdTextButton::CreateSecondaryUiButton(
-        this, base::UTF8ToUTF16(
-                  content_setting_bubble_model_->bubble_content().manage_text));
-    return manage_button_;
-  } else {
-    manage_link_ = new views::Link(base::UTF8ToUTF16(
-        content_setting_bubble_model_->bubble_content().manage_text));
-    manage_link_->set_listener(this);
-    return manage_link_;
-  }
+  const ContentSettingBubbleModel::BubbleContent& bubble_content =
+      content_setting_bubble_model_->bubble_content();
+  // Added as part of the primary view.
+  if (bubble_content.show_manage_text_as_checkbox)
+    return nullptr;
+
+  manage_link_ = new views::Link(base::UTF8ToUTF16(bubble_content.manage_text));
+  manage_link_->set_listener(this);
+  return manage_link_;
 }
 
 bool ContentSettingBubbleContents::Accept() {
   content_setting_bubble_model_->OnDoneClicked();
   return true;
 }
 
 bool ContentSettingBubbleContents::Close() {
   return true;
 }
 
 int ContentSettingBubbleContents::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_OK;
 }
 
 base::string16 ContentSettingBubbleContents::GetDialogButtonLabel(
     ui::DialogButton button) const {
+  const base::string16& done_text =
+      content_setting_bubble_model_->bubble_content().done_button_text;
+  if (!done_text.empty())
+    return done_text;
   return l10n_util::GetStringUTF16(IDS_DONE);
 }
 
 void ContentSettingBubbleContents::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
     return;
 
   // Content settings are based on the main frame, so if it switches then
   // close up shop.
   GetWidget()->Close();
 }
 
 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
-  if (manage_button_ == sender) {
-    GetWidget()->Close();
-    content_setting_bubble_model_->OnManageLinkClicked();
+  if (manage_checkbox_ == sender) {
+    content_setting_bubble_model_->OnManageCheckboxChecked(

[msw, 2017/04/06 00:44:56]

This could probably call GetDialogClientView()->UpdateDialogButtons() to trigger
the button update after calling OnManageCheckboxChecked, or perhaps something
more general (view layout/paint). Either way, it should have a comment like
"Toggling the check state may change the dialog button text."

[Charlie Harrison, 2017/04/06 02:04:58]

This solution works for me, thanks for the tip.

+        manage_checkbox_->checked());
   } else {
     RadioGroup::const_iterator i(
         std::find(radio_group_.begin(), radio_group_.end(), sender));
     DCHECK(i != radio_group_.end());
     content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
   }
 }
 
 void ContentSettingBubbleContents::LinkClicked(views::Link* source,
                                                int event_flags) {
@@ skipping 19 matching lines @@
   DCHECK(i != list_item_links_.end());
   content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(
       model->type(), model->GetDevices()[combobox->selected_index()].id);
 }