Re-land:

chrome/browser/ui/views/constrained_html_delegate_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
@@ skipping 52 matching lines @@
 
   HtmlDialogUIDelegate* html_delegate_;
 
   // The constrained window that owns |this|.  Saved so we can close it later.
   ConstrainedWindow* window_;
 };
 
 ConstrainedHtmlDelegateGtk::ConstrainedHtmlDelegateGtk(
     Profile* profile,
     HtmlDialogUIDelegate* delegate)
-    : HtmlDialogTabContentsDelegate(profile),
+    : views::WidgetGtk(new views::Widget),
+      HtmlDialogTabContentsDelegate(profile),
       html_tab_contents_(profile, NULL, MSG_ROUTING_NONE, NULL, NULL),
       tab_container_(NULL),
       html_delegate_(delegate),
       window_(NULL) {
   CHECK(delegate);
   html_tab_contents_.set_delegate(this);
 
   // Set |this| as a property so the ConstrainedHtmlUI can retrieve it.
   ConstrainedHtmlUI::GetPropertyAccessor().SetProperty(
       html_tab_contents_.property_bag(), this);
   html_tab_contents_.controller().LoadURL(delegate->GetDialogContentURL(),
                                           GURL(),
                                           PageTransition::START_PAGE);
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
+  params.native_widget = this;
   GetWidget()->Init(params);
 
   tab_container_ = new TabContentsContainer;
-  SetContentsView(tab_container_);
+  GetWidget()->SetContentsView(tab_container_);
   tab_container_->ChangeTabContents(&html_tab_contents_);
 
   gfx::Size dialog_size;
   html_delegate_->GetDialogSize(&dialog_size);
   gtk_widget_set_size_request(GetWidgetRoot(),
                               dialog_size.width(),
                               dialog_size.height());
 }
 
 ConstrainedHtmlDelegateGtk::~ConstrainedHtmlDelegateGtk() {
@@ skipping 12 matching lines @@
     Profile* profile,
     HtmlDialogUIDelegate* delegate,
     TabContents* container) {
   ConstrainedHtmlDelegateGtk* constrained_delegate =
       new ConstrainedHtmlDelegateGtk(profile, delegate);
   ConstrainedWindow* constrained_window =
       container->CreateConstrainedDialog(constrained_delegate);
   constrained_delegate->set_window(constrained_window);
   return constrained_window;
 }