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

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

Issue 2793413002: [subresource_filter] Update the desktop UI according to mocks (Closed)
Patch Set: Not as part of the extra view 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.h
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
index d6c0f53ffc5414cd702dbc00d408f7700194cc7d..225e2e3f0b14abedde34fb13125f9161a783fecc 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -124,8 +124,10 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
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_tex
Charlie Harrison 2017/04/05 22:35:32 Done. Changed to done_button_text.
private:
DISALLOW_COPY_AND_ASSIGN(BubbleContent);
@@ -154,6 +156,7 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
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) {}
@@ -199,6 +202,9 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
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;
}
@@ -226,6 +232,9 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
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;
}
@@ -318,9 +327,6 @@ class ContentSettingSubresourceFilterBubbleModel
~ContentSettingSubresourceFilterBubbleModel() override;
- void OnManageLinkClicked() override;
- ContentSettingSubresourceFilterBubbleModel* AsSubresourceFilterBubbleModel()
- override;
private:
void SetMessage();
@@ -328,6 +334,12 @@ class ContentSettingSubresourceFilterBubbleModel
// 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);
};

Powered by Google App Engine
This is Rietveld 408576698