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

Unified Diff: content/browser/web_contents/web_contents_view_child_frame.cc

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 months 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/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 {

Powered by Google App Engine
This is Rietveld 408576698