content/browser/renderer_host/render_widget_host_view_base.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: win fix Created 8 years, 2 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

« ash/system/tray/tray_background_view.h ('K') | « content/browser/renderer_host/render_widget_host_view_base.h ('k') | content/browser/renderer_host/render_widget_host_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_base.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc

index f7662385b6565b16fbc14ea7212692da10bee85d..54962bb8d1aec1380d083ba46a66126320d9aaf1 100644

--- a/content/browser/renderer_host/render_widget_host_view_base.cc

+++ b/content/browser/renderer_host/render_widget_host_view_base.cc

@@ -397,9 +397,10 @@ void RenderWidgetHostViewBase::SetBrowserAccessibilityManager(

browser_accessibility_manager_.reset(manager);

}

-void RenderWidgetHostViewBase::UpdateScreenInfo() {

- gfx::Display display = gfx::Screen::GetDisplayNearestPoint(

- GetViewBounds().origin());

+void RenderWidgetHostViewBase::UpdateScreenInfo(gfx::NativeView view) {

+ gfx::Display display =

+ gfx::Screen::GetScreenFor(view)->GetDisplayNearestPoint(

+ GetViewBounds().origin());

if (current_display_area_ == display.bounds() &&

current_device_scale_factor_ == display.device_scale_factor())

return;