Revert 42665 - broke build as I missed a unit test when building locally.

Adds geolocaiton support to the location bar content image model and content bubble model.
Most of these edits were lifted out of http://codereview.chromium.org/650180

TODO: add geolocation support to the views in the three UI platforms for the bubble model.
(NOTE this change results in poorly formed bubble contents for the geolocaiton bubble, this will be fixed up in the following CLs)


BUG=11246
TEST=open a site that uses geolocaiton, select allow/deny & click the icon.


Review URL: http://codereview.chromium.org/1344002

TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/1367002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42668 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 15 deletions

diff --git a/chrome/browser/content_setting_bubble_model.h b/chrome/browser/content_setting_bubble_model.h
index b318859..dcbafb7 100644
--- a/chrome/browser/content_setting_bubble_model.h
+++ b/chrome/browser/content_setting_bubble_model.h
@@ -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 @@ class ContentSettingBubbleModel : public NotificationObserver {
   };
   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 @@ class ContentSettingBubbleModel : public NotificationObserver {
   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 @@ class ContentSettingBubbleModel : public NotificationObserver {
   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_;