[subresource_filter] Update the desktop UI according to mocks

chrome/browser/ui/content_settings/content_setting_bubble_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 106 matching lines @@
     base::string16 title;
     base::string16 message;
     ListItems list_items;
     RadioGroup radio_group;
     bool radio_group_enabled;
     std::vector<DomainList> domain_lists;
     std::string custom_link;
     bool custom_link_enabled;
     std::string manage_text;
     bool show_manage_text_as_button;
+    bool show_manage_text_as_checkbox;
     MediaMenuMap media_menus;
     std::string learn_more_link;
+    base::string16 done_text;

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

nit: give this a better name like |done_button_text| or just |button_text|.

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

Done. Changed to done_button_text.

 
    private:
     DISALLOW_COPY_AND_ASSIGN(BubbleContent);
   };
 
   // Creates a bubble model for a particular |content_type|. Note that not all
   // bubbles fit this description.
   // TODO(msramek): Move this to ContentSettingSimpleBubbleModel or remove
   // entirely.
   static ContentSettingBubbleModel* CreateContentSettingBubbleModel(
       Delegate* delegate,
       content::WebContents* web_contents,
       Profile* profile,
       ContentSettingsType content_type);
 
   ~ContentSettingBubbleModel() override;
 
   const BubbleContent& bubble_content() const { return bubble_content_; }
 
   // content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   virtual void OnRadioClicked(int radio_index) {}
   virtual void OnListItemClicked(int index) {}
   virtual void OnCustomLinkClicked() {}
   virtual void OnManageLinkClicked() {}
+  virtual void OnChecked(bool is_checked) {}

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

nit: OnManageCheckboxChecked?

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

Done.

   virtual void OnLearnMoreLinkClicked() {}
   virtual void OnMediaMenuClicked(content::MediaStreamType type,
                                   const std::string& selected_device_id) {}
 
   // Called by the view code when the bubble is closed by the user using the
   // Done button.
   virtual void OnDoneClicked() {}
 
   // TODO(msramek): The casting methods below are only necessary because
   // ContentSettingBubbleController in the Cocoa UI needs to know the type of
@@ skipping 25 matching lines @@
   ContentSettingBubbleModel(
       Delegate* delegate,
       content::WebContents* web_contents,
       Profile* profile);
 
   content::WebContents* web_contents() const { return web_contents_; }
   Profile* profile() const { return profile_; }
   Delegate* delegate() const { return delegate_; }
 
   void set_title(const base::string16& title) { bubble_content_.title = title; }
+  void set_done_text(const base::string16& done_text) {

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

nit: match order to member declaration?

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

Done.

+    bubble_content_.done_text = done_text;
+  }
   void set_message(const base::string16& message) {
     bubble_content_.message = message;
   }
   void add_list_item(const ListItem& item) {
     bubble_content_.list_items.push_back(item);
   }
   void set_radio_group(const RadioGroup& radio_group) {
     bubble_content_.radio_group = radio_group;
   }
   void set_radio_group_enabled(bool enabled) {
     bubble_content_.radio_group_enabled = enabled;
   }
   void add_domain_list(const DomainList& domain_list) {
     bubble_content_.domain_lists.push_back(domain_list);
   }
   void set_custom_link(const std::string& link) {
     bubble_content_.custom_link = link;
   }
   void set_custom_link_enabled(bool enabled) {
     bubble_content_.custom_link_enabled = enabled;
   }
   void set_manage_text(const std::string& link) {
     bubble_content_.manage_text = link;
   }
   void set_show_manage_text_as_button(bool show_manage_text_as_button) {
     bubble_content_.show_manage_text_as_button = show_manage_text_as_button;
   }
+  void set_show_manage_text_as_checkbox(bool show_manage_text_as_checkbox) {
+    bubble_content_.show_manage_text_as_checkbox = show_manage_text_as_checkbox;
+  }
   void set_learn_more_link(const std::string& link) {
     bubble_content_.learn_more_link = link;
   }
   void add_media_menu(content::MediaStreamType type, const MediaMenu& menu) {
     bubble_content_.media_menus[type] = menu;
   }
   void set_selected_device(const content::MediaStreamDevice& device) {
     bubble_content_.media_menus[device.type].selected_device = device;
   }
   rappor::RapporServiceImpl* rappor_service() const { return rappor_service_; }
@@ skipping 72 matching lines @@
 // The model for the deceptive content bubble.
 class ContentSettingSubresourceFilterBubbleModel
     : public ContentSettingBubbleModel {
  public:
   ContentSettingSubresourceFilterBubbleModel(Delegate* delegate,
                                              content::WebContents* web_contents,
                                              Profile* profile);
 
   ~ContentSettingSubresourceFilterBubbleModel() override;
 
-  void OnManageLinkClicked() override;
-  ContentSettingSubresourceFilterBubbleModel* AsSubresourceFilterBubbleModel()
-      override;
 
  private:
   void SetMessage();
 
   // ContentSettingBubbleModel:
   void SetTitle() override;
   void SetManageText() override;
+  void OnChecked(bool is_checked) override;
+  ContentSettingSubresourceFilterBubbleModel* AsSubresourceFilterBubbleModel()
+      override;
+  void OnDoneClicked() override;
+
+  bool is_checked_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingSubresourceFilterBubbleModel);
 };
 
 // The model of the content settings bubble for media settings.
 class ContentSettingMediaStreamBubbleModel : public ContentSettingBubbleModel {
  public:
   ContentSettingMediaStreamBubbleModel(Delegate* delegate,
                                        content::WebContents* web_contents,
                                        Profile* profile);
@@ skipping 66 matching lines @@
   void SetTitle() override;
   void SetManageText() override;
   void OnManageLinkClicked() override;
 
   int selected_item_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingDownloadsBubbleModel);
 };
 
 #endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_