Index: chrome/browser/gtk/constrained_window_gtk.cc |
diff --git a/chrome/browser/gtk/constrained_window_gtk.cc b/chrome/browser/gtk/constrained_window_gtk.cc |
index f10dc030643035d022eff19120df61918507da7d..a569ac39ddcccd33a209b79dbbd0e5c5e7ff2f62 100644 |
--- a/chrome/browser/gtk/constrained_window_gtk.cc |
+++ b/chrome/browser/gtk/constrained_window_gtk.cc |
@@ -9,7 +9,12 @@ |
#include "chrome/browser/browser_list.h" |
#include "chrome/browser/gtk/gtk_util.h" |
#include "chrome/browser/tab_contents/tab_contents.h" |
+ |
+#if defined(TOUCH_UI) |
+#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() { |
} |
@@ -66,8 +71,8 @@ ConstrainedWindowGtk::~ConstrainedWindowGtk() { |
void ConstrainedWindowGtk::ShowConstrainedWindow() { |
gtk_widget_show_all(border_.get()); |
- // We collaborate with TabContentsViewGtk and stick ourselves in the |
- // TabContentsViewGtk's floating container. |
+ // We collaborate with TabContentsView and stick ourselves in the |
+ // TabContentsView's floating container. |
ContainingView()->AttachConstrainedWindow(this); |
visible_ = true; |
@@ -82,8 +87,8 @@ void ConstrainedWindowGtk::CloseConstrainedWindow() { |
delete this; |
} |
-TabContentsViewGtk* ConstrainedWindowGtk::ContainingView() { |
- return static_cast<TabContentsViewGtk*>(owner_->view()); |
+ConstrainedWindowGtk::TabContentsViewType* ConstrainedWindowGtk::ContainingView() { |
+ return static_cast<TabContentsViewType*>(owner_->view()); |
} |
gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender, |