Remove GetOutputNames from x11_util

ash/display/display_manager.cc

Index: ash/display/display_manager.cc
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 6aef6f41da558957106273f153bce087f4ec1ec0..82d5be138dc7e4baacfa8ca8946b4f6e006503a3 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -77,27 +77,6 @@ gfx::Display& GetInvalidDisplay() {
   return *invalid_display;
 }
 
-#if defined(OS_CHROMEOS)
-
-int64 FindInternalDisplayID() {
-  std::vector<XID> outputs;
-  ui::GetOutputDeviceHandles(&outputs);
-  std::vector<std::string> output_names = ui::GetOutputNames(outputs);
-  for (size_t i = 0; i < output_names.size(); ++i) {
-    if (chromeos::OutputConfigurator::IsInternalOutputName(
-            output_names[i])) {
-      uint16 manufacturer_id = 0;
-      uint16 product_code = 0;
-      ui::GetOutputDeviceData(
-          outputs[i], &manufacturer_id, &product_code, NULL);
-      return gfx::Display::GetID(manufacturer_id, product_code, i);
-    }
-  }
-  return gfx::Display::kInvalidDisplayID;
-}
-
-#endif
-
 }  // namespace
 
 using aura::RootWindow;
@@ -477,11 +456,6 @@ void DisplayManager::OnRootWindowResized(const aura::RootWindow* root,
 }
 
 void DisplayManager::Init() {
-#if defined(OS_CHROMEOS)
-  if (base::chromeos::IsRunningOnChromeOS())
-    gfx::Display::SetInternalDisplayId(FindInternalDisplayID());
-#endif
-
   // TODO(oshima): Move this logic to DisplayChangeObserver.
   const string size_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       switches::kAshHostWindowBounds);