Re-factor location bar/toolbar code to get rid of the browser dependency.

chrome/browser/ui/content_settings/content_setting_bubble_model.h

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 eabc97b4bdbcd2f1a44b422e92947418f7a61054..07f4b3dc35a95981b37784594ae8f4127466254d 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -17,18 +17,32 @@
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-class Browser;
 class Profile;
 class TabContentsWrapper;
 
+// Delegate which is used by ContentSettingBubbleModel.
+class ContentSettingBubbleModelDelegate {

[sky, 2012/03/12 20:59:19]

How come you didn't put this in a separate file like you did ToolbarModelHost.
Also, this name (and others) makes me thing you should name ToolbarModelHost
ToolbarModelDelegate.

[altimofeev, 2012/03/13 15:38:05]

Done.

+ public:
+  // Shows the cookies collected in the tab contents wrapper.
+  virtual void ShowCollectedCookiesDialog(TabContentsWrapper* contents) = 0;
+
+  // Shows the Content Settings page for a given content type.
+  virtual void ShowContentSettingsPage(ContentSettingsType type) = 0;
+
+ protected:
+  virtual ~ContentSettingBubbleModelDelegate() {}
+};
+
 // This model provides data for ContentSettingBubble, and also controls
 // the action triggered when the allow / block radio buttons are triggered.
 class ContentSettingBubbleModel : public content::NotificationObserver {
  public:
   virtual ~ContentSettingBubbleModel();
 
+  typedef ContentSettingBubbleModelDelegate Delegate;
+
   static ContentSettingBubbleModel* CreateContentSettingBubbleModel(
-      Browser* browser,
+      Delegate* delegate,
       TabContentsWrapper* tab_contents,
       Profile* profile,
       ContentSettingsType content_type);