| Index: chromeos/display/real_output_configurator_delegate.cc
|
| diff --git a/chromeos/display/real_output_configurator_delegate.cc b/chromeos/display/real_output_configurator_delegate.cc
|
| index 43b4cdb5636b5f88746204f87bf902b538af3d27..36924dd49f75cf3d43146c7dfe130f33717dc6a8 100644
|
| --- a/chromeos/display/real_output_configurator_delegate.cc
|
| +++ b/chromeos/display/real_output_configurator_delegate.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "chromeos/display/real_output_configurator_delegate.h"
|
|
|
| -#include <X11/Xatom.h>
|
| #include <X11/Xlib.h>
|
| +#include <X11/Xatom.h>
|
| #include <X11/extensions/dpms.h>
|
| #include <X11/extensions/XInput.h>
|
| #include <X11/extensions/XInput2.h>
|
| @@ -15,6 +15,7 @@
|
| #include <set>
|
| #include <utility>
|
|
|
| +#include "base/edid_parser_x11.h"
|
| #include "base/logging.h"
|
| #include "base/message_loop/message_pump_x11.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| @@ -263,7 +264,7 @@ RealOutputConfiguratorDelegate::InitOutputSnapshot(
|
| output.output = id;
|
| output.width_mm = info->mm_width;
|
| output.height_mm = info->mm_height;
|
| - output.has_display_id = GetDisplayId(id, index, &output.display_id);
|
| + output.has_display_id = base::GetDisplayId(id, index, &output.display_id);
|
| output.is_internal = IsInternalOutput(info);
|
| output.index = index;
|
|
|
|
|