Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4460)

Unified Diff: chrome/browser/gtk/constrained_window_gtk.cc

Issue 4319003: Replace TabContentsViewGtk with TabContentsViewViews as part of the ongoing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Last patchset was missing canvas_direct2d.cc edit, fixed it and sent to try bots. Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 14564dee7a7e4bffc95ce3cf82fdf9d3c523604a..cee66d7e3583beac2b5fb8a726c51f5a7c556280 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/views/tab_contents/tab_contents_view_views.h"
+#else
#include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
+#endif
ConstrainedWindowGtkDelegate::~ConstrainedWindowGtkDelegate() {
}
@@ -62,8 +67,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;
@@ -78,8 +83,8 @@ void ConstrainedWindowGtk::CloseConstrainedWindow() {
delete this;
}
-TabContentsViewGtk* ConstrainedWindowGtk::ContainingView() {
- return static_cast<TabContentsViewGtk*>(owner_->view());
+TabContentsViewType* ConstrainedWindowGtk::ContainingView() {
+ return static_cast<TabContentsViewType*>(owner_->view());
}
gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,

Powered by Google App Engine
This is Rietveld 408576698