Re-land:

chrome/browser/ui/gtk/constrained_window_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/gtk/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
+#elif defined(TOOLKIT_VIEWS)
+#include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h"
+#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #else
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #endif
 
 ConstrainedWindowGtkDelegate::~ConstrainedWindowGtkDelegate() {
 }
 
 bool ConstrainedWindowGtkDelegate::GetBackgroundColor(GdkColor* color) {
   return false;
 }
@@ skipping 87 matching lines @@
   // should not be used on linux/views.
 #if defined(TOOLKIT_GTK)
     static_cast<TabContentsViewGtk*>(owner_->view())->
         SetFocusedWidget(focus_widget);
 #endif
   }
 }
 
 ConstrainedWindowGtk::TabContentsViewType*
     ConstrainedWindowGtk::ContainingView() {
+#if defined(TOOLKIT_VIEWS)
+  return static_cast<NativeTabContentsViewGtk*>(
+      static_cast<TabContentsViewViews*>(owner_->view())->
+          native_tab_contents_view());
+#else
   return static_cast<TabContentsViewType*>(owner_->view());
+#endif
 }
 
 gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
                                           GdkEventKey* key) {
   if (key->keyval == GDK_Escape) {
     // Let the stack unwind so the event handler can release its ref
     // on widget().
     MessageLoop::current()->PostTask(FROM_HERE,
         factory_.NewRunnableMethod(
             &ConstrainedWindowGtk::CloseConstrainedWindow));
@@ skipping 11 matching lines @@
 
   FocusConstrainedWindow();
 }
 
 // static
 ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog(
     TabContents* parent,
     ConstrainedWindowGtkDelegate* delegate) {
   return new ConstrainedWindowGtk(parent, delegate);
 }