Move ash::DisplayInfo to ui

ui/display/manager/display_info.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/common/display/display_info.h"
+#include "ui/display/manager/display_info.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/display/display.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/size_f.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include "ui/display/win/dpi.h"
 #endif
 
-namespace ash {
+namespace ui {
 namespace {
 
 // Use larger than max int to catch overflow early.
 const int64_t kSynthesizedDisplayIdStart = 2200000000LL;
 
 int64_t synthesized_display_id = kSynthesizedDisplayIdStart;
 
 const float kDpi96 = 96.0;
 bool use_125_dsf_for_ui_scaling = true;
 
@@ skipping 16 matching lines @@
   return false;
 }
 
 // Display mode list is sorted by:
 //  * the area in pixels in ascending order
 //  * refresh rate in descending order
 struct ManagedDisplayModeSorter {
   explicit ManagedDisplayModeSorter(bool is_internal)
       : is_internal(is_internal) {}
 
-  bool operator()(const scoped_refptr<ManagedDisplayMode>& a,
-                  const scoped_refptr<ManagedDisplayMode>& b) {
+  bool operator()(const scoped_refptr<ui::ManagedDisplayMode>& a,
+                  const scoped_refptr<ui::ManagedDisplayMode>& b) {
     gfx::Size size_a_dip = a->GetSizeInDIP(is_internal);
     gfx::Size size_b_dip = b->GetSizeInDIP(is_internal);
     if (size_a_dip.GetArea() == size_b_dip.GetArea())
       return (a->refresh_rate() > b->refresh_rate());
     return (size_a_dip.GetArea() < size_b_dip.GetArea());
   }
 
   bool is_internal;
 };
 
@@ skipping 46 matching lines @@
   // DSF=1.25 is special on internal display. The screen is drawn with DSF=1.25
   // but it doesn't affect the screen size computation.
   if (use_125_dsf_for_ui_scaling && is_internal &&
       device_scale_factor_ == 1.25f)
     return gfx::ToFlooredSize(size_dip);
   size_dip.Scale(1.0f / device_scale_factor_);
   return gfx::ToFlooredSize(size_dip);
 }
 
 bool ManagedDisplayMode::IsEquivalent(
-    const scoped_refptr<ManagedDisplayMode>& other) const {
+    const scoped_refptr<ui::ManagedDisplayMode>& other) const {
   const float kEpsilon = 0.0001f;
   return size_ == other->size_ &&
          std::abs(ui_scale_ - other->ui_scale_) < kEpsilon &&
          std::abs(device_scale_factor_ - other->device_scale_factor_) <
              kEpsilon;
 }
 
 // static
 DisplayInfo DisplayInfo::CreateFromSpec(const std::string& spec) {
   return CreateFromSpecWithID(spec, display::Display::kInvalidDisplayID);
@@ skipping 89 matching lines @@
           // Use mode with largest area and highest refresh rate as native.
           largest_area = size.GetArea();
           highest_refresh_rate = refresh_rate;
           native_mode = i;
         }
         display_modes.push_back(make_scoped_refptr(
             new ManagedDisplayMode(size, refresh_rate, is_interlaced, false,
                                    1.0, device_scale_factor)));
       }
     }
-    scoped_refptr<ManagedDisplayMode> dm = display_modes[native_mode];
+    scoped_refptr<ui::ManagedDisplayMode> dm = display_modes[native_mode];
     display_modes[native_mode] = new ManagedDisplayMode(
         dm->size(), dm->refresh_rate(), dm->is_interlaced(), true,
         dm->ui_scale(), dm->device_scale_factor());
   }
 
   if (id == display::Display::kInvalidDisplayID)
     id = synthesized_display_id++;
-  DisplayInfo display_info(
+  ui::DisplayInfo display_info(
       id, base::StringPrintf("Display-%d", static_cast<int>(id)), has_overscan);
   display_info.set_device_scale_factor(device_scale_factor);
   display_info.SetRotation(rotation, display::Display::ROTATION_SOURCE_ACTIVE);
   display_info.set_configured_ui_scale(ui_scale);
   display_info.SetBounds(bounds_in_native);
   display_info.SetManagedDisplayModes(display_modes);
 
   // To test the overscan, it creates the default 5% overscan.
   if (has_overscan) {
     int width = bounds_in_native.width() / device_scale_factor / 40;
@@ skipping 228 matching lines @@
 }
 
 void DisplayInfo::ClearInputDevices() {
   input_devices_.clear();
 }
 
 void ResetDisplayIdForTest() {
   synthesized_display_id = kSynthesizedDisplayIdStart;
 }
 
-}  // namespace ash
+}  // namespace ui