ui/display/chromeos/x11/native_display_delegate_x11.cc - Issue 1671223002: Revert of Give user ability to file a feedback report from the display error notification.

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: ui/display/chromeos/x11/native_display_delegate_x11.cc

Issue 1671223002: Revert of Give user ability to file a feedback report from the display error notification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « ui/display/chromeos/x11/display_snapshot_x11.cc ('k') | ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/display/chromeos/x11/native_display_delegate_x11.cc

diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.cc b/ui/display/chromeos/x11/native_display_delegate_x11.cc

index e4b2b6966040606bd709c1db944e1414d2311e40..35f3819b0b83be46112e38e43839f26995fa244c 100644

--- a/ui/display/chromeos/x11/native_display_delegate_x11.cc

+++ b/ui/display/chromeos/x11/native_display_delegate_x11.cc

@@ -311,12 +311,11 @@

std::set<RRCrtc>* last_used_crtcs,

int index) {

int64_t display_id = 0;

- ui::EDIDParserX11 edid_parser(output);

- if (!edid_parser.GetDisplayId(static_cast<uint8_t>(index), &display_id))

+ if (!GetDisplayId(output, static_cast<uint8_t>(index), &display_id))

display_id = index;

bool has_overscan = false;

- edid_parser.GetOutputOverscanFlag(&has_overscan);

+ GetOutputOverscanFlag(output, &has_overscan);

DisplayConnectionType type = GetDisplayConnectionTypeFromName(info->name);

if (type == DISPLAY_CONNECTION_TYPE_UNKNOWN)

@@ -368,9 +367,8 @@

type,

IsOutputAspectPreservingScaling(output),

has_overscan,

- edid_parser.GetDisplayName(),

+ GetDisplayName(output),

display_modes,

- edid_parser.edid(),

current_mode,

native_mode,

output,