content: Resubmit "Move constrained html windows to TabContentsWrapper."

chrome/browser/ui/views/constrained_html_delegate_views.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 "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/gfx/rect.h"
 #include "views/view.h"
 #include "views/widget/widget_delegate.h"
 
 class ConstrainedHtmlDelegateViews : public TabContentsContainer,
@@ skipping 93 matching lines @@
 
 void ConstrainedHtmlDelegateViews::OnDialogCloseFromWebUI() {
   closed_via_webui_ = true;
   window_->CloseConstrainedWindow();
 }
 
 // static
 ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(
     Profile* profile,
     HtmlDialogUIDelegate* delegate,
-    TabContents* container) {
+    TabContentsWrapper* container) {
   ConstrainedHtmlDelegateViews* constrained_delegate =
       new ConstrainedHtmlDelegateViews(profile, delegate);
   ConstrainedWindow* constrained_window =
-      new ConstrainedWindowViews(container, constrained_delegate);
+      new ConstrainedWindowViews(container->tab_contents(),
+                                 constrained_delegate);
   constrained_delegate->set_window(constrained_window);
   return constrained_window;
 }