Revert 225054 "linux_aura: Implement most of DesktopScreenX11."

trunk/src/chromeos/display/real_output_configurator_delegate.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 <cmath>
 #include <set>
 #include <utility>
 
 #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"
 
 namespace chromeos {
 
 namespace {
 
 // DPI measurements.
 const float kMmInInch = 25.4;
@@ skipping 226 matching lines @@
 OutputConfigurator::OutputSnapshot
 RealOutputConfiguratorDelegate::InitOutputSnapshot(
     RROutput id,
     XRROutputInfo* info,
     RRCrtc* last_used_crtc,
     int index) {
   OutputConfigurator::OutputSnapshot output;
   output.output = id;
   output.width_mm = info->mm_width;
   output.height_mm = info->mm_height;
-  output.has_display_id = base::GetDisplayId(id, index, &output.display_id);
+  output.has_display_id = GetDisplayId(id, index, &output.display_id);
   output.is_internal = IsInternalOutput(info);
   output.index = index;
 
   // Use the index as a valid display ID even if the internal
   // display doesn't have valid EDID because the index
   // will never change.
   if (!output.has_display_id && output.is_internal)
     output.has_display_id = true;
 
   if (info->crtc) {
@@ skipping 223 matching lines @@
                 << (*outputs)[i].touch_device_id << " to output #" << i;
         break;
       }
     }
   }
 
   XIFreeDeviceInfo(info);
 }
 
 }  // namespace chromeos