Remove TabContentsContainerGtk from ConstrainedWebDialogDelegateGtk.

chrome/browser/ui/gtk/constrained_web_dialog_delegate_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/webui/constrained_web_dialog_delegate_base.h"
 
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
-#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/gfx/size.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
 using content::WebContents;
 using ui::WebDialogDelegate;
 using ui::WebDialogWebContentsDelegate;
 
 class ConstrainedWebDialogDelegateGtk : public ConstrainedWindowGtkDelegate,
@@ skipping 26 matching lines @@
   }
   virtual ConstrainedWindow* window() OVERRIDE {
     return impl_->window();
   }
   virtual TabContents* tab() OVERRIDE {
     return impl_->tab();
   }
 
   // ConstrainedWindowGtkDelegate interface
   virtual GtkWidget* GetWidgetRoot() OVERRIDE {
-    return tab_contents_container_.widget();
+    return tab()->web_contents()->GetView()->GetNativeView();
   }
   virtual GtkWidget* GetFocusWidget() OVERRIDE {
     return tab()->web_contents()->GetContentNativeView();
   }
   virtual void DeleteDelegate() OVERRIDE {
     if (!impl_->closed_via_webui())
       GetWebDialogDelegate()->OnDialogClosed("");
     delete this;
   }
   virtual bool GetBackgroundColor(GdkColor* color) OVERRIDE {
     *color = ui::kGdkWhite;
     return true;
   }
 
  private:
   scoped_ptr<ConstrainedWebDialogDelegateBase> impl_;
 
-  TabContentsContainerGtk tab_contents_container_;
-
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateGtk);
 };
 
 ConstrainedWebDialogDelegateGtk::ConstrainedWebDialogDelegateGtk(
     Profile* profile,
     WebDialogDelegate* delegate,
     WebDialogWebContentsDelegate* tab_delegate)
-    : impl_(new ConstrainedWebDialogDelegateBase(profile, delegate, tab_delegate)),
-      tab_contents_container_(NULL) {
-  tab_contents_container_.SetTab(tab());
-
+    : impl_(new ConstrainedWebDialogDelegateBase(
+                    profile, delegate, tab_delegate)) {
   gfx::Size dialog_size;
   delegate->GetDialogSize(&dialog_size);
-  gtk_widget_set_size_request(GTK_WIDGET(tab_contents_container_.widget()),
+  gtk_widget_set_size_request(GTK_WIDGET(GetWidgetRoot()),
                               dialog_size.width(),
                               dialog_size.height());
 
   gtk_widget_show_all(GetWidgetRoot());
 }
 
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
       Profile* profile,
       WebDialogDelegate* delegate,
       WebDialogWebContentsDelegate* tab_delegate,
       content::WebContents* web_contents) {
   ConstrainedWebDialogDelegateGtk* constrained_delegate =
       new ConstrainedWebDialogDelegateGtk(profile, delegate, tab_delegate);
   ConstrainedWindow* constrained_window =
       new ConstrainedWindowGtk(web_contents, constrained_delegate);
   constrained_delegate->set_window(constrained_window);
   return constrained_delegate;
 }