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

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

Issue 8566011: Completes the GetWindowRect/GetRootWindowRect/GetScreenInfo changes I thought I had finished with... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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_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;
+}

Powered by Google App Engine
This is Rietveld 408576698