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..5f9c41c002f21303b1cedcec3501dd78c63aa304 100644 |
--- a/chromeos/display/real_output_configurator_delegate.cc |
+++ b/chromeos/display/real_output_configurator_delegate.cc |
@@ -4,12 +4,12 @@ |
#include "chromeos/display/real_output_configurator_delegate.h" |
-#include <X11/Xatom.h> |
-#include <X11/Xlib.h> |
#include <X11/extensions/dpms.h> |
#include <X11/extensions/XInput.h> |
#include <X11/extensions/XInput2.h> |
#include <X11/extensions/Xrandr.h> |
+#include <X11/Xatom.h> |
+#include <X11/Xlib.h> |
#include <cmath> |
#include <set> |
@@ -17,6 +17,7 @@ |
#include "base/logging.h" |
#include "base/message_loop/message_pump_x11.h" |
+#include "base/x11/edid_parser_x11.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |
#include "chromeos/dbus/power_manager_client.h" |
#include "chromeos/display/output_util.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; |