Re-land:

chrome/browser/ui/views/constrained_window_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/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 558 matching lines @@
 // ConstrainedWindowViews, public:
 
 ConstrainedWindowViews::ConstrainedWindowViews(
     TabContents* owner,
     views::WindowDelegate* window_delegate)
     : owner_(owner),
       ALLOW_THIS_IN_INITIALIZER_LIST(native_constrained_window_(
           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);
 }
 
 ConstrainedWindowViews::~ConstrainedWindowViews() {
 }
 
 views::Window* ConstrainedWindowViews::GetWindow() {
   return native_constrained_window_->AsNativeWindow()->GetWindow();
 }
 
@@ skipping 10 matching lines @@
   FocusConstrainedWindow();
 }
 
 void ConstrainedWindowViews::CloseConstrainedWindow() {
   // Broadcast to all observers of NOTIFY_CWINDOW_CLOSED.
   // One example of such an observer is AutomationCWindowTracker in the
   // automation component.
   NotificationService::current()->Notify(NotificationType::CWINDOW_CLOSED,
                                          Source<ConstrainedWindow>(this),
                                          NotificationService::NoDetails());
-  GetWindow()->CloseWindow();
+  GetWindow()->Close();
 }
 
 void ConstrainedWindowViews::FocusConstrainedWindow() {
   if ((!owner_->delegate() ||
        owner_->delegate()->ShouldFocusConstrainedWindow()) &&
       GetWindow()->window_delegate() &&
       GetWindow()->window_delegate()->GetInitiallyFocusedView()) {
     GetWindow()->window_delegate()->GetInitiallyFocusedView()->RequestFocus();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// ConstrainedWindowViews, views::Window overrides:
+
+views::NonClientFrameView* ConstrainedWindowViews::CreateFrameViewForWindow() {
+  return new ConstrainedWindowFrameView(this);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, NativeConstrainedWindowDelegate implementation:
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowDestroyed() {
   // Tell our constraining TabContents that we've gone so it can update its
   // list.
   owner_->WillClose(this);
 }
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowMouseActivate() {
   GetWindow()->Activate();
 }
 
-views::NonClientFrameView* ConstrainedWindowViews::CreateFrameViewForWindow() {
-  return new ConstrainedWindowFrameView(this);
+views::internal::NativeWindowDelegate*
+    ConstrainedWindowViews::AsNativeWindowDelegate() {
+  return this;
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindow, public:
 
 // static
 ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog(
     TabContents* parent,
     views::WindowDelegate* window_delegate) {
   return new ConstrainedWindowViews(parent, window_delegate);
 }