extensions/browser/api/system_display/display_info_provider.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

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: extensions/browser/api/system_display/display_info_provider.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase Created 4 years, 11 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:

Index: extensions/browser/api/system_display/display_info_provider.cc

diff --git a/extensions/browser/api/system_display/display_info_provider.cc b/extensions/browser/api/system_display/display_info_provider.cc

index b49949b611e1e84109ec7ef5bf12573e4d842428..df7b26afc46ea2361a22875bdd62123a556f0730 100644

--- a/extensions/browser/api/system_display/display_info_provider.cc

+++ b/extensions/browser/api/system_display/display_info_provider.cc

@@ -77,8 +77,7 @@ DisplayInfoProvider::CreateDisplayUnitInfo(const gfx::Display& display,

void DisplayInfoProvider::EnableUnifiedDesktop(bool enable) {}

DisplayInfo DisplayInfoProvider::GetAllDisplaysInfo() {

- // TODO(scottmg): Native is wrong http://crbug.com/133312

- gfx::Screen* screen = gfx::Screen::GetNativeScreen();

+ gfx::Screen* screen = gfx::Screen::GetScreen();

int64_t primary_id = screen->GetPrimaryDisplay().id();

std::vector<gfx::Display> displays = screen->GetAllDisplays();

DisplayInfo all_displays;