content: Move collected cookies constrained window to TabContentsWrapper.

To split the ConstrainedWindow feature off of TabContents entirely (moving it
to a helper object on TabContentsWrapper), I'll need to first make each
constrained window TabContentsWrapper aware first. I started just hacking

BUG=95257
TEST=compiles


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

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

4 files changed, 21 insertions, 27 deletions

diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 94f6066..6eb2328 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -984,9 +984,9 @@ void BrowserWindowGtk::ShowRepostFormWarningDialog(TabContents* tab_contents) {
   new RepostFormWarningGtk(GetNativeHandle(), tab_contents);
 }
 
-void BrowserWindowGtk::ShowCollectedCookiesDialog(TabContents* tab_contents) {
+void BrowserWindowGtk::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) {
   // Deletes itself on close.
-  new CollectedCookiesGtk(GetNativeHandle(), tab_contents);
+  new CollectedCookiesGtk(GetNativeHandle(), wrapper);
 }
 
 void BrowserWindowGtk::ShowThemeInstallBubble() {
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index d23c439..d5cf0e3 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -106,7 +106,7 @@ class BrowserWindowGtk : public BrowserWindow,
   virtual bool IsDownloadShelfVisible() const;
   virtual DownloadShelf* GetDownloadShelf();
   virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);
-  virtual void ShowCollectedCookiesDialog(TabContents* tab_contents);
+  virtual void ShowCollectedCookiesDialog(TabContentsWrapper* tab_contents);
   virtual void ShowThemeInstallBubble();
   virtual void ConfirmBrowserCloseWithPendingDownloads();
   virtual gfx::NativeWindow ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index cb9e5e1..963dcc3 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -77,17 +77,16 @@ const std::string GetInfobarLabel(ContentSetting setting,
       return std::string();
   }
 }
+
 }  // namespace
 
 CollectedCookiesGtk::CollectedCookiesGtk(GtkWindow* parent,
-                                         TabContents* tab_contents)
-    : tab_contents_(tab_contents),
+                                         TabContentsWrapper* wrapper)
+    : wrapper_(wrapper),
       status_changed_(false) {
-  TabSpecificContentSettings* content_settings =
-      TabContentsWrapper::GetCurrentWrapperForContents(tab_contents)->
-          content_settings();
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
-                 Source<TabSpecificContentSettings>(content_settings));
+                 Source<TabSpecificContentSettings>(
+                     wrapper->content_settings()));
 
   Init();
 }
@@ -164,7 +163,7 @@ void CollectedCookiesGtk::Init() {
   blocked_cookies_tree_adapter_->Init();
   EnableControls();
   ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
-  window_ = new ConstrainedWindowGtk(tab_contents_, this);
+  window_ = new ConstrainedWindowGtk(wrapper_->tab_contents(), this);
 }
 
 GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
@@ -185,9 +184,7 @@ GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
                                       GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
 
-  TabSpecificContentSettings* content_settings =
-      TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_)->
-          content_settings();
+  TabSpecificContentSettings* content_settings = wrapper_->content_settings();
 
   allowed_cookies_tree_model_.reset(
       content_settings->GetAllowedCookiesTreeModel());
@@ -241,10 +238,8 @@ GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
 }
 
 GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
-  TabContentsWrapper* wrapper =
-      TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
   HostContentSettingsMap* host_content_settings_map =
-      wrapper->profile()->GetHostContentSettingsMap();
+      wrapper_->profile()->GetHostContentSettingsMap();
 
   GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
 
@@ -267,7 +262,7 @@ GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
                                       GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
 
-  TabSpecificContentSettings* content_settings = wrapper->content_settings();
+  TabSpecificContentSettings* content_settings = wrapper_->content_settings();
 
   blocked_cookies_tree_model_.reset(
       content_settings->GetBlockedCookiesTreeModel());
@@ -433,9 +428,8 @@ void CollectedCookiesGtk::Observe(int type,
 
 void CollectedCookiesGtk::OnClose(GtkWidget* close_button) {
   if (status_changed_) {
-    TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_)->
-        infobar_tab_helper()->AddInfoBar(
-            new CollectedCookiesInfoBarDelegate(tab_contents_));
+    wrapper_->infobar_tab_helper()->AddInfoBar(
+        new CollectedCookiesInfoBarDelegate(wrapper_->tab_contents()));
   }
   window_->CloseConstrainedWindow();
 }
@@ -463,8 +457,7 @@ void CollectedCookiesGtk::AddExceptions(GtkTreeSelection* selection,
       if (!last_domain_name.empty())
         multiple_domains_added = true;
       last_domain_name = origin_node->GetTitle();
-      Profile* profile =
-          Profile::FromBrowserContext(tab_contents_->browser_context());
+      Profile* profile = wrapper_->profile();
       origin_node->CreateContentException(
           profile->GetHostContentSettingsMap(), setting);
     }
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.h b/chrome/browser/ui/gtk/collected_cookies_gtk.h
index 0b5563b..18d739e 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.h
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.h
@@ -19,6 +19,7 @@
 #include "ui/base/gtk/gtk_signal.h"
 
 class CookiesTreeModel;
+class TabContentsWrapper;
 
 // CollectedCookiesGtk is a dialog that displays the allowed and blocked
 // cookies of the current tab contents.  To display the dialog, invoke
@@ -26,10 +27,10 @@ class CookiesTreeModel;
 // content settings tab helper.
 
 class CollectedCookiesGtk : public ConstrainedWindowGtkDelegate,
-                                   gtk_tree::TreeAdapter::Delegate,
-                                   NotificationObserver {
+                            public gtk_tree::TreeAdapter::Delegate,
+                            public NotificationObserver {
  public:
-  CollectedCookiesGtk(GtkWindow* parent, TabContents* tab_contents);
+  CollectedCookiesGtk(GtkWindow* parent, TabContentsWrapper* wrapper);
 
   // ConstrainedWindowGtkDelegate methods.
   virtual GtkWidget* GetWidgetRoot();
@@ -112,8 +113,8 @@ class CollectedCookiesGtk : public ConstrainedWindowGtkDelegate,
   // Displays information about selected cookie.
   GtkWidget* cookie_info_view_;
 
-  // The tab contents.
-  TabContents* tab_contents_;
+  // The tab contents wrapper.
+  TabContentsWrapper* wrapper_;
 
   bool status_changed_;