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

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
@@ skipping 314 matching lines @@
 #endif
 
 void RenderWidgetHostViewAura::SetBackground(const SkBitmap& background) {
   RenderWidgetHostView::SetBackground(background);
   host_->SetBackground(background);
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   window_->layer()->SetFillsBoundsOpaquely(background.isOpaque());
 #endif
 }
 
-void RenderWidgetHostViewAura::GetDefaultScreenInfo(
-    WebKit::WebScreenInfo* results) {
-  GetScreenInfo(results);
-}
-
 void RenderWidgetHostViewAura::GetScreenInfo(WebKit::WebScreenInfo* results) {
-  const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
-  results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
-  results->availableRect = results->rect;
-  // TODO(derat): Don't hardcode this?
-  results->depth = 24;
-  results->depthPerComponent = 8;
+  GetDefaultScreenInfo(results);
 }
 
 gfx::Rect RenderWidgetHostViewAura::GetRootWindowBounds() {
   // TODO(beng): this is actually wrong, we are supposed to return the bounds
   //             of the container "top level" window, but we don't have a firm
   //             concept of what constitutes a toplevel right now, so just do
   //             this.
   return window_->GetScreenBounds();
 }
 
@@ skipping 11 matching lines @@
 void RenderWidgetHostViewAura::SetHasHorizontalScrollbar(
     bool has_horizontal_scrollbar) {
   // Not needed. Mac-only.
 }
 
 void RenderWidgetHostViewAura::SetScrollOffsetPinning(
     bool is_pinned_to_left, bool is_pinned_to_right) {
   // Not needed. Mac-only.
 }
 
-#if defined(OS_WIN)
-void RenderWidgetHostViewAura::WillWmDestroy() {
-  // Nothing to do.
-}
-#endif
-
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 gfx::PluginWindowHandle RenderWidgetHostViewAura::GetCompositingSurface() {
   // The GPU process renders to an offscreen surface (created by the GPU
   // process), which is later displayed by the browser. As the GPU process
   // creates this surface, we can return any non-zero value.
   return 1;
 }
 #else
 gfx::PluginWindowHandle RenderWidgetHostViewAura::GetCompositingSurface() {
   // TODO(oshima): The original implementation was broken as
@@ skipping 142 matching lines @@
   aura::Desktop* desktop = aura::Desktop::GetInstance();
   if (desktop->GetEventHandlerForPoint(screen_point) != window_)
     return;
 
   gfx::NativeCursor cursor = current_cursor_.GetNativeCursor();
   if (is_loading_ && cursor == aura::kCursorPointer)
     cursor = aura::kCursorProgress;
 
   aura::Desktop::GetInstance()->SetCursor(cursor);
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// RenderWidgetHostView, public:
+
+// static
+void RenderWidgetHostView::GetDefaultScreenInfo(
+    WebKit::WebScreenInfo* results) {
+  const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
+  results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
+  results->availableRect = results->rect;
+  // TODO(derat): Don't hardcode this?
+  results->depth = 24;
+  results->depthPerComponent = 8;
+}