Re-land:

chrome/browser/ui/gtk/constrained_window_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_CONSTRAINED_WINDOW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_CONSTRAINED_WINDOW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/task.h"
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 class TabContents;
 typedef struct _GdkColor GdkColor;
 #if defined(TOUCH_UI)
 class TabContentsViewTouch;
+#elif defined(TOOLKIT_VIEWS)
+class NativeTabContentsViewGtk;
 #else
 class TabContentsViewGtk;
 #endif
 
 class ConstrainedWindowGtkDelegate {
  public:
   // Returns the widget that will be put in the constrained window's container.
   virtual GtkWidget* GetWidgetRoot() = 0;
 
   // Returns the widget that should get focus when ConstrainedWindow is focused.
@@ skipping 12 matching lines @@
   virtual ~ConstrainedWindowGtkDelegate();
 };
 
 // Constrained window implementation for the GTK port. Unlike the Win32 system,
 // ConstrainedWindowGtk doesn't draw draggable fake windows and instead just
 // centers the dialog. It is thus an order of magnitude simpler.
 class ConstrainedWindowGtk : public ConstrainedWindow {
  public:
 #if defined(TOUCH_UI)
    typedef TabContentsViewTouch TabContentsViewType;
+#elif defined(TOOLKIT_VIEWS)
+   typedef NativeTabContentsViewGtk TabContentsViewType;
 #else
    typedef TabContentsViewGtk TabContentsViewType;
 #endif
 
   virtual ~ConstrainedWindowGtk();
 
   // Overridden from ConstrainedWindow:
   virtual void ShowConstrainedWindow();
   virtual void CloseConstrainedWindow();
   virtual void FocusConstrainedWindow();
@@ skipping 30 matching lines @@
 
   // Stores if |ShowConstrainedWindow()| has been called.
   bool visible_;
 
   ScopedRunnableMethodFactory<ConstrainedWindowGtk> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_CONSTRAINED_WINDOW_GTK_H_