Remove TabContents from constrained windows.

chrome/browser/ui/gtk/constrained_window_gtk.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/gtk/focus_store_gtk.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 
 using content::BrowserThread;
 
 ConstrainedWindowGtkDelegate::~ConstrainedWindowGtkDelegate() {
 }
 
 bool ConstrainedWindowGtkDelegate::GetBackgroundColor(GdkColor* color) {
   return false;
 }
 
 bool ConstrainedWindowGtkDelegate::ShouldHaveBorderPadding() const {
   return true;
 }
 
 ConstrainedWindowGtk::ConstrainedWindowGtk(
-    TabContents* tab_contents,
+    content::WebContents* web_contents,
     ConstrainedWindowGtkDelegate* delegate)
-    : tab_contents_(tab_contents),
+    : web_contents_(web_contents),
       delegate_(delegate),
       visible_(false),
       weak_factory_(this) {
-  DCHECK(tab_contents);
+  DCHECK(web_contents);
   DCHECK(delegate);
   GtkWidget* dialog = delegate->GetWidgetRoot();
+  ConstrainedWindowTabHelper::CreateForWebContents(web_contents);
 
   // Unlike other users of CreateBorderBin, we need a dedicated frame around
   // our "window".
   GtkWidget* ebox = gtk_event_box_new();
   GtkWidget* frame = gtk_frame_new(NULL);
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
 
   GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   if (delegate->ShouldHaveBorderPadding()) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
@@ skipping 17 matching lines @@
   gtk_container_add(GTK_CONTAINER(ebox), frame);
   border_.Own(ebox);
 
   gtk_widget_add_events(widget(), GDK_KEY_PRESS_MASK);
   g_signal_connect(widget(), "key-press-event", G_CALLBACK(OnKeyPressThunk),
                    this);
   g_signal_connect(widget(), "hierarchy-changed",
                    G_CALLBACK(OnHierarchyChangedThunk), this);
 
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(
-          tab_contents_->web_contents());
+      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
   constrained_window_tab_helper->AddConstrainedDialog(this);
 }
 
 ConstrainedWindowGtk::~ConstrainedWindowGtk() {
   border_.Destroy();
 }
 
 void ConstrainedWindowGtk::ShowConstrainedWindow() {
   gtk_widget_show_all(border_.get());
 
   // We collaborate with WebContentsView and stick ourselves in the
   // WebContentsView's floating container.
   ContainingView()->AttachConstrainedWindow(this);
 
   visible_ = true;
 }
 
 void ConstrainedWindowGtk::CloseConstrainedWindow() {
   if (visible_)
     ContainingView()->RemoveConstrainedWindow(this);
   delegate_->DeleteDelegate();
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(
-          tab_contents_->web_contents());
+      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
   constrained_window_tab_helper->WillClose(this);
 
   delete this;
 }
 
 void ConstrainedWindowGtk::FocusConstrainedWindow() {
   GtkWidget* focus_widget = delegate_->GetFocusWidget();
   if (!focus_widget)
     return;
 
   // The user may have focused another tab. In this case do not grab focus
   // until this tab is refocused.
   ConstrainedWindowTabHelper* helper =
-      ConstrainedWindowTabHelper::FromWebContents(
-          tab_contents_->web_contents());
+      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
   if ((!helper->delegate() ||
        helper->delegate()->ShouldFocusConstrainedWindow()) &&
       gtk_util::IsWidgetAncestryVisible(focus_widget)) {
     gtk_widget_grab_focus(focus_widget);
   } else {
     ContainingView()->focus_store()->SetWidget(focus_widget);
   }
 }
 
 ConstrainedWindowGtk::TabContentsViewType*
-    ConstrainedWindowGtk::ContainingView() {
-  return
-      ChromeWebContentsViewDelegateGtk::GetFor(tab_contents_->web_contents());
+ConstrainedWindowGtk::ContainingView() {
+  return ChromeWebContentsViewDelegateGtk::GetFor(web_contents_);
 }
 
 gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
                                           GdkEventKey* key) {
   if (key->keyval == GDK_Escape) {
     // Let the stack unwind so the event handler can release its ref
     // on widget().
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ConstrainedWindowGtk::CloseConstrainedWindow,
                    weak_factory_.GetWeakPtr()));
     return TRUE;
   }
 
   return FALSE;
 }
 
 void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
                                               GtkWidget* previous_toplevel) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
     return;
 
   FocusConstrainedWindow();
 }