Completes the GetWindowRect/GetRootWindowRect/GetScreenInfo changes I thought I had finished with...

content/browser/renderer_host/render_widget_host_view.cc

Index: content/browser/renderer_host/render_widget_host_view.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view.cc	(revision 109889)
+++ content/browser/renderer_host/render_widget_host_view.cc	(working copy)
@@ -7,10 +7,6 @@
 #include "base/logging.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(TOOLKIT_USES_GTK)
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
@@ -18,26 +14,10 @@
 #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.
-#if defined(OS_MACOSX)
+#if defined(TOUCH_UI)
 // static
 void RenderWidgetHostView::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
-  *results = WebKit::WebScreenInfoFactory::screenInfo(NULL);
-}
-#endif
-
-#if defined(OS_POSIX) && defined(USE_AURA)
-// static
-void RenderWidgetHostView::GetDefaultScreenInfo(
-    WebKit::WebScreenInfo* results) {
-  NOTIMPLEMENTED();
-}
-#elif 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);