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

Unified Diff: content/browser/renderer_host/render_widget_host_view.cc

Issue 7753013: content: Make ifdefs match with where this is used (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Factor out common code Created 9 years, 4 months 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: content/browser/renderer_host/render_widget_host_view.cc
diff --git a/content/browser/renderer_host/render_widget_host_view.cc b/content/browser/renderer_host/render_widget_host_view.cc
index f96559c920868d24b4c8d30ba5c3a57eb535f63d..8061bfda6015b9683efb013dbdb17b2dff73fc50 100644
--- a/content/browser/renderer_host/render_widget_host_view.cc
+++ b/content/browser/renderer_host/render_widget_host_view.cc
@@ -5,7 +5,17 @@
#include "content/browser/renderer_host/render_widget_host_view.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
+
+#if defined(OS_MACOSX)
#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h"
+#endif
+
+#if defined(TOUCH_UI)
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+
+#include "content/browser/renderer_host/gtk_window_utils.h"
+#endif
// TODO(jam): move this to render_widget_host_view_mac.mm when it moves to
// content.
@@ -17,6 +27,18 @@ void RenderWidgetHostView::GetDefaultScreenInfo(
}
#endif
+// TODO(erg): move this to render_widget_host_view_views_gtk.cc when if it
+// moves to content.
+#if defined(TOUCH_UI)
+// static
+void RenderWidgetHostView::GetDefaultScreenInfo(
+ WebKit::WebScreenInfo* results) {
+ GdkWindow* gdk_window =
+ gdk_display_get_default_group(gdk_display_get_default());
+ content::GetScreenInfoFromNativeWindow(gdk_window, results);
+}
+#endif
+
RenderWidgetHostView::~RenderWidgetHostView() {}
void RenderWidgetHostView::SetBackground(const SkBitmap& background) {
« no previous file with comments | « content/browser/renderer_host/gtk_window_utils.cc ('k') | content/browser/renderer_host/render_widget_host_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698