Remove GetOutputNames from x11_util

ash/display/display_manager.cc

 // Copyright (c) 2012 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 "ash/display/display_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 59 matching lines @@
   bool operator()(const DisplayInfo& a, const DisplayInfo& b) {
     return a.id() < b.id();
   }
 };
 
 gfx::Display& GetInvalidDisplay() {
   static gfx::Display* invalid_display = new gfx::Display();
   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;
 using aura::Window;
 using std::string;
 using std::vector;
 
 DEFINE_WINDOW_PROPERTY_KEY(int64, kDisplayIdKey,
                            gfx::Display::kInvalidDisplayID);
 
@@ skipping 359 matching lines @@
     if (display.size() != root->GetHostSize()) {
       display.SetSize(root->GetHostSize());
       display_info_[display.id()].UpdateBounds(
           gfx::Rect(root->GetHostOrigin(), root->GetHostSize()));
       Shell::GetInstance()->screen()->NotifyBoundsChanged(display);
     }
   }
 }
 
 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);
   vector<string> parts;
   base::SplitString(size_str, ',', &parts);
   for (vector<string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter) {
     AddDisplayFromSpec(*iter);
   }
   if (displays_.empty())
@@ skipping 121 matching lines @@
   // to change there.
   if (DisplayController::HasPrimaryDisplay()  &&
       display_info.id() == DisplayController::GetPrimaryDisplay().id()) {
     new_display.set_bounds(gfx::Rect(new_display.bounds().size()));
   }
   return new_display;
 }
 
 }  // namespace internal
 }  // namespace ash