Move chromeos/display/* to ui/display/chromeos

ash/display/event_transformation_handler.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 "ash/display/event_transformation_handler.h"
 
 #include <cmath>
 
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/events/event.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
-#include "chromeos/display/output_configurator.h"
+#include "ui/display/chromeos/output_configurator.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace internal {
 namespace {
 
 // Boost factor for non-integrated displays.
 const float kBoostForNonIntegrated = 1.20f;
 }
 
@@ skipping 22 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 // This is to scale the TouchEvent's radius when the touch display is in
 // mirror mode. TouchEvent's radius is often reported in the touchscreen's
 // native resolution. In mirror mode, the touch display could be configured
 // at a lower resolution. We scale down the radius using the ratio defined as
 // the sqrt of
 // (mirror_width * mirror_height) / (native_width * native_height)
 void EventTransformationHandler::OnTouchEvent(ui::TouchEvent* event) {
-  using chromeos::OutputConfigurator;
+  using ui::OutputConfigurator;
   OutputConfigurator* output_configurator =
       ash::Shell::GetInstance()->output_configurator();
 
   // Check output_configurator's output_state instead of checking
   // DisplayManager::IsMirrored() because the compositor based mirroring
   // won't cause the scaling issue.
   if (output_configurator->output_state() != ui::OUTPUT_STATE_DUAL_MIRROR)
     return;
 
   const std::map<int, float>& area_ratio_map =
@@ skipping 11 matching lines @@
   }
 
   float area_ratio_sqrt = std::sqrt(area_ratio_map.begin()->second);
   event->set_radius_x(event->radius_x() * area_ratio_sqrt);
   event->set_radius_y(event->radius_y() * area_ratio_sqrt);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace internal
 }  // namespace ash