| Index: content/browser/web_contents/web_contents_view_child_frame.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_child_frame.cc b/content/browser/web_contents/web_contents_view_child_frame.cc
|
| index 62f85703286d5bdf641f10825e42d4b14995896c..bbbde021d6dcae252a1e0fbc0ce580097ddea27b 100644
|
| --- a/content/browser/web_contents/web_contents_view_child_frame.cc
|
| +++ b/content/browser/web_contents/web_contents_view_child_frame.cc
|
| @@ -47,16 +47,15 @@ gfx::NativeWindow WebContentsViewChildFrame::GetTopLevelNativeWindow() const {
|
| return GetOuterView()->GetTopLevelNativeWindow();
|
| }
|
|
|
| -void WebContentsViewChildFrame::GetScreenInfo(
|
| - blink::WebScreenInfo* web_screen_info) const {
|
| +void WebContentsViewChildFrame::GetScreenInfo(ScreenInfo* screen_info) const {
|
| // TODO(wjmaclean): falling back to the default screen info is not what used
|
| // to happen in RenderWidgetHostViewChildFrame, but it seems like the right
|
| // thing to do. We should keep an eye on this in case the else-clause below
|
| // causes problems.
|
| if (web_contents_->GetOuterWebContents())
|
| - GetOuterView()->GetScreenInfo(web_screen_info);
|
| + GetOuterView()->GetScreenInfo(screen_info);
|
| else
|
| - WebContentsView::GetDefaultScreenInfo(web_screen_info);
|
| + WebContentsView::GetDefaultScreenInfo(screen_info);
|
| }
|
|
|
| void WebContentsViewChildFrame::GetContainerBounds(gfx::Rect* out) const {
|
|
|