| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 109889)
|
| +++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)
|
| @@ -332,18 +332,8 @@
|
| #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() {
|
| @@ -375,12 +365,6 @@
|
| // 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
|
| @@ -543,3 +527,17 @@
|
|
|
| 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;
|
| +}
|
|
|