Rename gfx::Display/Screen to display::Display/Screen in ash

ash/touch/touchscreen_util.cc

 // Copyright 2014 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/touch/touchscreen_util.h"
 
 #include <set>
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "ui/events/devices/input_device.h"
 
 namespace ash {
 
 namespace {
 
 using DisplayInfoList = std::vector<DisplayInfo*>;
 using DeviceList = std::vector<const ui::TouchscreenDevice*>;
 
 // Helper method to associate |display| and |device|.
 void Associate(DisplayInfo* display, const ui::TouchscreenDevice* device) {
   display->AddInputDevice(device->id);
-  display->set_touch_support(gfx::Display::TOUCH_SUPPORT_AVAILABLE);
+  display->set_touch_support(display::Display::TOUCH_SUPPORT_AVAILABLE);
 }
 
 // Returns true if |path| is likely a USB device.
 bool IsDeviceConnectedViaUsb(const base::FilePath& path) {
   std::vector<base::FilePath::StringType> components;
   path.GetComponents(&components);
 
   for (base::FilePath::StringType component : components) {
     if (base::StartsWith(component, "usb",
                          base::CompareCase::INSENSITIVE_ASCII))
@@ skipping 67 matching lines @@
 
       continue;
     }
 
     ++display_it;
   }
 }
 
 // Returns true if |display| is internal.
 bool IsInternalDisplay(DisplayInfo* display) {
-  return gfx::Display::IsInternalDisplayId(display->id());
+  return display::Display::IsInternalDisplayId(display->id());
 }
 
 // Returns true if |device| is internal.
 bool IsInternalDevice(const ui::TouchscreenDevice* device) {
   return device->type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL;
 }
 
 void AssociateInternalDevices(DisplayInfoList* displays, DeviceList* devices) {
   VLOG(2) << "Trying to match internal devices (" << displays->size()
           << " displays and " << devices->size() << " devices to match)";
@@ skipping 150 matching lines @@
   AssociateSameSizeDevices(&displays, &devices);
   AssociateToSingleDisplay(&displays, &devices);
 
   for (const DisplayInfo* display : displays)
     LOG(WARNING) << "Unmatched display " << display->name();
   for (const ui::TouchscreenDevice* device : devices)
     LOG(WARNING) << "Unmatched device " << device->name;
 }
 
 }  // namespace ash