Index: chrome/browser/renderer_host/render_widget_host_view_views.cc |
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc |
index 7b35392287959ff50f06e6513d7d73d73757219f..420815834d0c26fe92a1b1316dbdc5d69cba843b 100644 |
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc |
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc |
@@ -985,9 +985,12 @@ void RenderWidgetHostViewViews::GetDefaultScreenInfo( |
void RenderWidgetHostViewViews::GetScreenInfo(WebKit::WebScreenInfo* results) { |
#if !defined(USE_AURA) |
views::Widget* widget = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL; |
- if (widget) |
+ if (widget && widget->GetNativeView()) |
content::GetScreenInfoFromNativeWindow(widget->GetNativeView()->window, |
results); |
+ else |
oshima
2011/09/21 04:21:49
can you move #end here so that aura can get defaul
|
+ RenderWidgetHostView::GetDefaultScreenInfo(results); |
+ |
sadrul
2011/09/21 04:06:11
-newline
|
#endif |
} |