Renamed OutputConfigurator to DisplayConfigurator

ui/display/chromeos/x11/touchscreen_delegate_x11.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 "ui/display/chromeos/x11/touchscreen_delegate_x11.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 
 #include <cmath>
 #include <set>
 
 #include "base/message_loop/message_pump_x11.h"
 #include "ui/display/chromeos/display_mode.h"
 #include "ui/display/chromeos/display_snapshot.h"
 
 namespace ui {
 
 TouchscreenDelegateX11::TouchscreenDelegateX11()
     : display_(base::MessagePumpX11::GetDefaultXDisplay()) {}
 
 TouchscreenDelegateX11::~TouchscreenDelegateX11() {}
 
 void TouchscreenDelegateX11::AssociateTouchscreens(
-    OutputConfigurator::DisplayStateList* outputs) {
+    DisplayConfigurator::DisplayStateList* outputs) {
   int ndevices = 0;
   Atom valuator_x = XInternAtom(display_, "Abs MT Position X", False);
   Atom valuator_y = XInternAtom(display_, "Abs MT Position Y", False);
   if (valuator_x == None || valuator_y == None)
     return;
 
   std::set<int> no_match_touchscreen;
   XIDeviceInfo* info = XIQueryDevice(display_, XIAllDevices, &ndevices);
   for (int i = 0; i < ndevices; i++) {
     if (!info[i].enabled || info[i].use != XIFloatingSlave)
@@ skipping 31 matching lines @@
         is_direct_touch = touch_info->mode == XIDirectTouch;
       }
 #endif
     }
 
     // Touchscreens should have absolute X and Y axes,
     // and be direct touch devices.
     if (width > 0.0 && height > 0.0 && is_direct_touch) {
       size_t k = 0;
       for (; k < outputs->size(); k++) {
-        OutputConfigurator::DisplayState* output = &(*outputs)[k];
+        DisplayConfigurator::DisplayState* output = &(*outputs)[k];
         if (output->touch_device_id != None)
           continue;
 
         const DisplayMode* mode_info = output->display->native_mode();
         if (!mode_info)
           continue;
 
         // Allow 1 pixel difference between screen and touchscreen
         // resolutions.  Because in some cases for monitor resolution
         // 1024x768 touchscreen's resolution would be 1024x768, but for
@@ skipping 36 matching lines @@
         break;
       }
     }
   }
 
   XIFreeDeviceInfo(info);
 }
 
 void TouchscreenDelegateX11::ConfigureCTM(
     int touch_device_id,
-    const OutputConfigurator::CoordinateTransformation& ctm) {
+    const DisplayConfigurator::CoordinateTransformation& ctm) {
   VLOG(1) << "ConfigureCTM: id=" << touch_device_id << " scale=" << ctm.x_scale
           << "x" << ctm.y_scale << " offset=(" << ctm.x_offset << ", "
           << ctm.y_offset << ")";
   int ndevices = 0;
   XIDeviceInfo* info = XIQueryDevice(display_, touch_device_id, &ndevices);
   Atom prop = XInternAtom(display_, "Coordinate Transformation Matrix", False);
   Atom float_atom = XInternAtom(display_, "FLOAT", False);
   if (ndevices == 1 && prop != None && float_atom != None) {
     Atom type;
     int format;
@@ skipping 28 matching lines @@
                        format,
                        PropModeReplace,
                        reinterpret_cast<unsigned char*>(value),
                        9);
     }
   }
   XIFreeDeviceInfo(info);
 }
 
 }  // namespace ui