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

Unified Diff: chrome/browser/content_setting_bubble_model.h

Issue 1367002: Revert 42665 - broke build as I missed a unit test when building locally.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/content_setting_bubble_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_setting_bubble_model.h
===================================================================
--- chrome/browser/content_setting_bubble_model.h (revision 42667)
+++ chrome/browser/content_setting_bubble_model.h (working copy)
@@ -13,7 +13,6 @@
#include "chrome/common/notification_registrar.h"
#include "third_party/skia/include/core/SkBitmap.h"
-class GURL;
class Profile;
class SkBitmap;
class TabContents;
@@ -47,18 +46,11 @@
};
typedef std::vector<RadioGroup> RadioGroups;
- struct DomainList {
- std::string title;
- std::vector<GURL> hosts;
- };
-
struct BubbleContent {
std::string title;
PopupItems popup_items;
RadioGroups radio_groups;
- std::vector<DomainList> domain_lists;
std::string manage_link;
- std::string clear_link;
};
const BubbleContent& bubble_content() const { return bubble_content_; }
@@ -71,7 +63,6 @@
virtual void OnRadioClicked(int radio_group, int radio_index) {}
virtual void OnPopupClicked(int index) {}
virtual void OnManageLinkClicked() {}
- virtual void OnClearLinkClicked() {}
protected:
ContentSettingBubbleModel(TabContents* tab_contents, Profile* profile,
@@ -87,15 +78,9 @@
void add_radio_group(const RadioGroup& radio_group) {
bubble_content_.radio_groups.push_back(radio_group);
}
- void add_domain_list(const DomainList& domain_list) {
- bubble_content_.domain_lists.push_back(domain_list);
- }
void set_manage_link(const std::string& link) {
bubble_content_.manage_link = link;
}
- void set_clear_link(const std::string& link) {
- bubble_content_.clear_link = link;
- }
private:
TabContents* tab_contents_;
Property changes on: chrome\browser\content_setting_bubble_model.h
___________________________________________________________________
Deleted: svn:eol-style
- LF
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/content_setting_bubble_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698