| 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 35f3819b0b83be46112e38e43839f26995fa244c..e4b2b6966040606bd709c1db944e1414d2311e40 100644
|
| --- a/ui/display/chromeos/x11/native_display_delegate_x11.cc
|
| +++ b/ui/display/chromeos/x11/native_display_delegate_x11.cc
|
| @@ -311,11 +311,12 @@ DisplaySnapshotX11* NativeDisplayDelegateX11::InitDisplaySnapshot(
|
| std::set<RRCrtc>* last_used_crtcs,
|
| int index) {
|
| int64_t display_id = 0;
|
| - if (!GetDisplayId(output, static_cast<uint8_t>(index), &display_id))
|
| + ui::EDIDParserX11 edid_parser(output);
|
| + if (!edid_parser.GetDisplayId(static_cast<uint8_t>(index), &display_id))
|
| display_id = index;
|
|
|
| bool has_overscan = false;
|
| - GetOutputOverscanFlag(output, &has_overscan);
|
| + edid_parser.GetOutputOverscanFlag(&has_overscan);
|
|
|
| DisplayConnectionType type = GetDisplayConnectionTypeFromName(info->name);
|
| if (type == DISPLAY_CONNECTION_TYPE_UNKNOWN)
|
| @@ -367,8 +368,9 @@ DisplaySnapshotX11* NativeDisplayDelegateX11::InitDisplaySnapshot(
|
| type,
|
| IsOutputAspectPreservingScaling(output),
|
| has_overscan,
|
| - GetDisplayName(output),
|
| + edid_parser.GetDisplayName(),
|
| display_modes,
|
| + edid_parser.edid(),
|
| current_mode,
|
| native_mode,
|
| output,
|
|
|