content: Make ifdefs match with where this is used

content/browser/renderer_host/render_widget_host_view.cc

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..1fa805695f1ec2a1562f21b13f7a203f11bdb20e 100644
--- a/content/browser/renderer_host/render_widget_host_view.cc
+++ b/content/browser/renderer_host/render_widget_host_view.cc
@@ -7,6 +7,11 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h"
 
+#if defined(TOUCH_UI)
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#endif
+
 // TODO(jam): move this to render_widget_host_view_mac.mm when it moves to
 // content.
 #if defined(OS_MACOSX)
@@ -17,6 +22,42 @@ void RenderWidgetHostView::GetDefaultScreenInfo(
 }
 #endif
 
+// TODO(erg): move this to render_widget_host_view_views_gtk.cc when if it

[jam, 2011/08/25 23:13:54]

this would be the 3d copy of this code :)

see the comment in render_widget_host_view_views_gtk.cc:
// TODO(oshima): This is a copy from RenderWidgetHostViewGtk. Replace this

If we're gonna reuse this, then I think that function should go into a gtk file
in content. Then we can also one cc file that's included for both gtk + touch
builds that has the :GetDefaultScreenInfo() function, since now it's duplicated
with the one in  render_widget_host_view_gtk.cc.

+// moves to content.
+#if defined(TOUCH_UI)
+
+namespace {
+
+// This was copied from render_widget_host_view_views_gtk.cc to make this link;
+// it is already copied (again) from RenderWidgetHostViewGtk.
+void GetScreenInfoFromNativeWindow(
+    GdkWindow* gdk_window, WebKit::WebScreenInfo* results) {
+  GdkScreen* screen = gdk_drawable_get_screen(gdk_window);
+  *results = WebKit::WebScreenInfoFactory::screenInfo(
+      gdk_x11_drawable_get_xdisplay(gdk_window),
+      gdk_x11_screen_get_screen_number(screen));
+
+  // TODO(tony): We should move this code into WebScreenInfoFactory.
+  int monitor_number = gdk_screen_get_monitor_at_window(screen, gdk_window);
+  GdkRectangle monitor_rect;
+  gdk_screen_get_monitor_geometry(screen, monitor_number, &monitor_rect);
+  results->rect = WebKit::WebRect(monitor_rect.x, monitor_rect.y,
+                                  monitor_rect.width, monitor_rect.height);
+  // TODO(tony): Should we query _NET_WORKAREA to get the workarea?
+  results->availableRect = results->rect;
+}
+
+}  // namespace
+
+// static
+void RenderWidgetHostView::GetDefaultScreenInfo(
+    WebKit::WebScreenInfo* results) {
+  GdkWindow* gdk_window =
+      gdk_display_get_default_group(gdk_display_get_default());
+  GetScreenInfoFromNativeWindow(gdk_window, results);
+}
+#endif
+
 RenderWidgetHostView::~RenderWidgetHostView() {}
 
 void RenderWidgetHostView::SetBackground(const SkBitmap& background) {