Re-land:

chrome/browser/ui/views/constrained_window_views.cc

Index: chrome/browser/ui/views/constrained_window_views.cc
===================================================================
--- chrome/browser/ui/views/constrained_window_views.cc	(revision 85284)
+++ chrome/browser/ui/views/constrained_window_views.cc	(working copy)
@@ -576,8 +576,11 @@
           NativeConstrainedWindow::CreateNativeConstrainedWindow(this))) {
   GetWindow()->non_client_view()->SetFrameView(CreateFrameViewForWindow());
   views::Window::InitParams params(window_delegate);
+  params.native_window = native_constrained_window_->AsNativeWindow();
   params.widget_init_params.child = true;
   params.widget_init_params.parent = owner->GetNativeView();
+  params.widget_init_params.native_widget =
+      native_constrained_window_->AsNativeWindow()->AsNativeWidget();
   GetWindow()->InitWindow(params);
 }
 
@@ -608,7 +611,7 @@
   NotificationService::current()->Notify(NotificationType::CWINDOW_CLOSED,
                                          Source<ConstrainedWindow>(this),
                                          NotificationService::NoDetails());
-  GetWindow()->CloseWindow();
+  GetWindow()->Close();
 }
 
 void ConstrainedWindowViews::FocusConstrainedWindow() {
@@ -621,6 +624,13 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// ConstrainedWindowViews, views::Window overrides:
+
+views::NonClientFrameView* ConstrainedWindowViews::CreateFrameViewForWindow() {
+  return new ConstrainedWindowFrameView(this);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, NativeConstrainedWindowDelegate implementation:
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowDestroyed() {
@@ -633,10 +643,12 @@
   GetWindow()->Activate();
 }
 
-views::NonClientFrameView* ConstrainedWindowViews::CreateFrameViewForWindow() {
-  return new ConstrainedWindowFrameView(this);
+views::internal::NativeWindowDelegate*
+    ConstrainedWindowViews::AsNativeWindowDelegate() {
+  return this;
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindow, public: