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

chrome/browser/ui/content_settings/content_setting_bubble_model.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 #pragma once
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #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);
 
   ContentSettingsType content_type() const { return content_type_; }
 
   struct PopupItem {
     SkBitmap bitmap;
     std::string title;
     TabContentsWrapper* tab_contents;
@@ skipping 85 matching lines @@
   Profile* profile_;
   ContentSettingsType content_type_;
   BubbleContent bubble_content_;
   // A registrar for listening for TAB_CONTENTS_DESTROYED notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingBubbleModel);
 };
 
 #endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_