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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.h

Issue 777103002: Add the names of plugins to the blocked plugin bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more nit Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_ 6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 content::MediaStreamDevice selected_device; 72 content::MediaStreamDevice selected_device;
73 bool disabled; 73 bool disabled;
74 }; 74 };
75 typedef std::map<content::MediaStreamType, MediaMenu> MediaMenuMap; 75 typedef std::map<content::MediaStreamType, MediaMenu> MediaMenuMap;
76 76
77 struct BubbleContent { 77 struct BubbleContent {
78 BubbleContent(); 78 BubbleContent();
79 ~BubbleContent(); 79 ~BubbleContent();
80 80
81 std::string title; 81 std::string title;
82 base::string16 plugin_names;
82 PopupItems popup_items; 83 PopupItems popup_items;
83 RadioGroup radio_group; 84 RadioGroup radio_group;
84 bool radio_group_enabled; 85 bool radio_group_enabled;
85 std::vector<DomainList> domain_lists; 86 std::vector<DomainList> domain_lists;
86 std::string custom_link; 87 std::string custom_link;
87 bool custom_link_enabled; 88 bool custom_link_enabled;
88 std::string manage_link; 89 std::string manage_link;
89 MediaMenuMap media_menus; 90 MediaMenuMap media_menus;
90 std::string learn_more_link; 91 std::string learn_more_link;
91 92
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 protected: 126 protected:
126 ContentSettingBubbleModel( 127 ContentSettingBubbleModel(
127 content::WebContents* web_contents, 128 content::WebContents* web_contents,
128 Profile* profile, 129 Profile* profile,
129 ContentSettingsType content_type); 130 ContentSettingsType content_type);
130 131
131 content::WebContents* web_contents() const { return web_contents_; } 132 content::WebContents* web_contents() const { return web_contents_; }
132 Profile* profile() const { return profile_; } 133 Profile* profile() const { return profile_; }
133 134
134 void set_title(const std::string& title) { bubble_content_.title = title; } 135 void set_title(const std::string& title) { bubble_content_.title = title; }
136 void set_plugin_names(const base::string16& plugin_names) {
137 bubble_content_.plugin_names = plugin_names;
138 }
135 void add_popup(const PopupItem& popup) { 139 void add_popup(const PopupItem& popup) {
136 bubble_content_.popup_items.push_back(popup); 140 bubble_content_.popup_items.push_back(popup);
137 } 141 }
138 void set_radio_group(const RadioGroup& radio_group) { 142 void set_radio_group(const RadioGroup& radio_group) {
139 bubble_content_.radio_group = radio_group; 143 bubble_content_.radio_group = radio_group;
140 } 144 }
141 void set_radio_group_enabled(bool enabled) { 145 void set_radio_group_enabled(bool enabled) {
142 bubble_content_.radio_group_enabled = enabled; 146 bubble_content_.radio_group_enabled = enabled;
143 } 147 }
144 void add_domain_list(const DomainList& domain_list) { 148 void add_domain_list(const DomainList& domain_list) {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 void IgnoreProtocolHandler(); 225 void IgnoreProtocolHandler();
222 void ClearOrSetPreviousHandler(); 226 void ClearOrSetPreviousHandler();
223 227
224 int selected_item_; 228 int selected_item_;
225 ProtocolHandlerRegistry* registry_; 229 ProtocolHandlerRegistry* registry_;
226 ProtocolHandler pending_handler_; 230 ProtocolHandler pending_handler_;
227 ProtocolHandler previous_handler_; 231 ProtocolHandler previous_handler_;
228 }; 232 };
229 233
230 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_ 234 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698