Remove unnecessary display:: namespaces.

ui/display/manager/managed_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 "ui/display/manager/managed_display_info.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 43 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<display::ManagedDisplayMode>& a,
-                  const scoped_refptr<display::ManagedDisplayMode>& b) {
+  bool operator()(const scoped_refptr<ManagedDisplayMode>& a,
+                  const scoped_refptr<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 18 matching lines @@
                                        float refresh_rate,
                                        bool is_interlaced,
                                        bool native)
     : size_(size),
       refresh_rate_(refresh_rate),
       is_interlaced_(is_interlaced),
       native_(native),
       ui_scale_(1.0f),
       device_scale_factor_(1.0f) {}
 
-ManagedDisplayMode::~ManagedDisplayMode(){};
+ManagedDisplayMode::~ManagedDisplayMode() {}
 
 ManagedDisplayMode::ManagedDisplayMode(const gfx::Size& size,
                                        float refresh_rate,
                                        bool is_interlaced,
                                        bool native,
                                        float ui_scale,
                                        float device_scale_factor)
     : size_(size),
       refresh_rate_(refresh_rate),
       is_interlaced_(is_interlaced),
       native_(native),
       ui_scale_(ui_scale),
       device_scale_factor_(device_scale_factor) {}
 
 gfx::Size ManagedDisplayMode::GetSizeInDIP(bool is_internal) const {
   gfx::SizeF size_dip(size_);
   size_dip.Scale(ui_scale_);
   // 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<display::ManagedDisplayMode>& other) const {
+    const scoped_refptr<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
 ManagedDisplayInfo ManagedDisplayInfo::CreateFromSpec(const std::string& spec) {
   return CreateFromSpecWithID(spec, kInvalidDisplayId);
@@ skipping 22 matching lines @@
       main_spec, "@", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   if (parts.size() == 2) {
     double scale_in_double = 0;
     if (base::StringToDouble(parts[1], &scale_in_double))
       ui_scale = scale_in_double;
     main_spec = parts[0];
   }
 
   parts = base::SplitString(main_spec, "/", base::KEEP_WHITESPACE,
                             base::SPLIT_WANT_NONEMPTY);
-  display::Display::Rotation rotation(display::Display::ROTATE_0);
+  Display::Rotation rotation(Display::ROTATE_0);
   bool has_overscan = false;
   if (!parts.empty()) {
     main_spec = parts[0];
     if (parts.size() >= 2) {
       std::string options = parts[1];
       for (size_t i = 0; i < options.size(); ++i) {
         char c = options[i];
         switch (c) {
           case 'o':
             has_overscan = true;
             break;
           case 'r':  // rotate 90 degrees to 'right'.
-            rotation = display::Display::ROTATE_90;
+            rotation = Display::ROTATE_90;
             break;
           case 'u':  // 180 degrees, 'u'pside-down.
-            rotation = display::Display::ROTATE_180;
+            rotation = Display::ROTATE_180;
             break;
           case 'l':  // rotate 90 degrees to 'left'.
-            rotation = display::Display::ROTATE_270;
+            rotation = Display::ROTATE_270;
             break;
         }
       }
     }
   }
 
   float device_scale_factor = 1.0f;
   if (!GetDisplayBounds(main_spec, &bounds_in_native, &device_scale_factor)) {
 #if defined(OS_WIN)
-    device_scale_factor = display::win::GetDPIScale();
+    device_scale_factor = win::GetDPIScale();
 #endif
   }
 
   ManagedDisplayModeList display_modes;
   parts = base::SplitString(main_spec, "#", base::KEEP_WHITESPACE,
                             base::SPLIT_WANT_NONEMPTY);
   if (parts.size() == 2) {
     size_t native_mode = 0;
     int largest_area = -1;
     float highest_refresh_rate = -1.0f;
@@ skipping 18 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<display::ManagedDisplayMode> dm = display_modes[native_mode];
+    scoped_refptr<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 == kInvalidDisplayId)
     id = synthesized_display_id++;
-  display::ManagedDisplayInfo display_info(
+  ManagedDisplayInfo 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.SetRotation(rotation, 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;
     int height = bounds_in_native.height() / device_scale_factor / 40;
     display_info.SetOverscanInsets(gfx::Insets(height, width, height, width));
     display_info.UpdateDisplaySize();
   }
 
   DVLOG(1) << "DisplayInfoFromSpec info=" << display_info.ToString()
            << ", spec=" << spec;
   return display_info;
 }
 
 // static
 void ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(bool enable) {
   use_125_dsf_for_ui_scaling = enable;
 }
 
 ManagedDisplayInfo::ManagedDisplayInfo()
     : id_(kInvalidDisplayId),
       has_overscan_(false),
-      active_rotation_source_(display::Display::ROTATION_SOURCE_UNKNOWN),
-      touch_support_(display::Display::TOUCH_SUPPORT_UNKNOWN),
+      active_rotation_source_(Display::ROTATION_SOURCE_UNKNOWN),
+      touch_support_(Display::TOUCH_SUPPORT_UNKNOWN),
       device_scale_factor_(1.0f),
       device_dpi_(kDpi96),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
       native_(false),
       is_aspect_preserving_scaling_(false),
       clear_overscan_insets_(false),
       color_profile_(ui::COLOR_PROFILE_STANDARD) {}
 
 ManagedDisplayInfo::ManagedDisplayInfo(int64_t id,
                                        const std::string& name,
                                        bool has_overscan)
     : id_(id),
       name_(name),
       has_overscan_(has_overscan),
-      active_rotation_source_(display::Display::ROTATION_SOURCE_UNKNOWN),
-      touch_support_(display::Display::TOUCH_SUPPORT_UNKNOWN),
+      active_rotation_source_(Display::ROTATION_SOURCE_UNKNOWN),
+      touch_support_(Display::TOUCH_SUPPORT_UNKNOWN),
       device_scale_factor_(1.0f),
       device_dpi_(kDpi96),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
       native_(false),
       is_aspect_preserving_scaling_(false),
       clear_overscan_insets_(false),
       color_profile_(ui::COLOR_PROFILE_STANDARD) {}
 
 ManagedDisplayInfo::ManagedDisplayInfo(const ManagedDisplayInfo& other) =
     default;
 
 ManagedDisplayInfo::~ManagedDisplayInfo() {}
 
-void ManagedDisplayInfo::SetRotation(display::Display::Rotation rotation,
-                                     display::Display::RotationSource source) {
+void ManagedDisplayInfo::SetRotation(Display::Rotation rotation,
+                                     Display::RotationSource source) {
   rotations_[source] = rotation;
-  rotations_[display::Display::ROTATION_SOURCE_ACTIVE] = rotation;
+  rotations_[Display::ROTATION_SOURCE_ACTIVE] = rotation;
   active_rotation_source_ = source;
 }
 
-display::Display::Rotation ManagedDisplayInfo::GetActiveRotation() const {
-  return GetRotation(display::Display::ROTATION_SOURCE_ACTIVE);
+Display::Rotation ManagedDisplayInfo::GetActiveRotation() const {
+  return GetRotation(Display::ROTATION_SOURCE_ACTIVE);
 }
 
-display::Display::Rotation ManagedDisplayInfo::GetRotation(
-    display::Display::RotationSource source) const {
+Display::Rotation ManagedDisplayInfo::GetRotation(
+    Display::RotationSource source) const {
   if (rotations_.find(source) == rotations_.end())
-    return display::Display::ROTATE_0;
+    return Display::ROTATE_0;
   return rotations_.at(source);
 }
 
 void ManagedDisplayInfo::Copy(const ManagedDisplayInfo& native_info) {
   DCHECK(id_ == native_info.id_);
   name_ = native_info.name_;
   has_overscan_ = native_info.has_overscan_;
 
   active_rotation_source_ = native_info.active_rotation_source_;
   touch_support_ = native_info.touch_support_;
@@ skipping 50 matching lines @@
 void ManagedDisplayInfo::UpdateDisplaySize() {
   size_in_pixel_ = bounds_in_native_.size();
   if (!overscan_insets_in_dip_.IsEmpty()) {
     gfx::Insets insets_in_pixel =
         overscan_insets_in_dip_.Scale(device_scale_factor_);
     size_in_pixel_.Enlarge(-insets_in_pixel.width(), -insets_in_pixel.height());
   } else {
     overscan_insets_in_dip_.Set(0, 0, 0, 0);
   }
 
-  if (GetActiveRotation() == display::Display::ROTATE_90 ||
-      GetActiveRotation() == display::Display::ROTATE_270) {
+  if (GetActiveRotation() == Display::ROTATE_90 ||
+      GetActiveRotation() == Display::ROTATE_270) {
     size_in_pixel_.SetSize(size_in_pixel_.height(), size_in_pixel_.width());
   }
   gfx::SizeF size_f(size_in_pixel_);
   size_f.Scale(GetEffectiveUIScale());
   size_in_pixel_ = gfx::ToFlooredSize(size_f);
 }
 
 void ManagedDisplayInfo::SetOverscanInsets(const gfx::Insets& insets_in_dip) {
   overscan_insets_in_dip_ = insets_in_dip;
 }
 
 gfx::Insets ManagedDisplayInfo::GetOverscanInsetsInPixel() const {
   return overscan_insets_in_dip_.Scale(device_scale_factor_);
 }
 
 void ManagedDisplayInfo::SetManagedDisplayModes(
     const ManagedDisplayModeList& display_modes) {
   display_modes_ = display_modes;
-  std::sort(
-      display_modes_.begin(), display_modes_.end(),
-      ManagedDisplayModeSorter(display::Display::IsInternalDisplayId(id_)));
+  std::sort(display_modes_.begin(), display_modes_.end(),
+            ManagedDisplayModeSorter(Display::IsInternalDisplayId(id_)));
 }
 
 gfx::Size ManagedDisplayInfo::GetNativeModeSize() const {
   for (size_t i = 0; i < display_modes_.size(); ++i) {
     if (display_modes_[i]->native())
       return display_modes_[i]->size();
   }
   return gfx::Size();
 }
 
 std::string ManagedDisplayInfo::ToString() const {
   int rotation_degree = static_cast<int>(GetActiveRotation()) * 90;
   std::string devices_str;
 
   for (size_t i = 0; i < input_devices_.size(); ++i) {
     devices_str += base::IntToString(input_devices_[i]);
     if (i != input_devices_.size() - 1)
       devices_str += ", ";
   }
 
   std::string result = base::StringPrintf(
       "ManagedDisplayInfo[%lld] native bounds=%s, size=%s, device-scale=%g, "
       "overscan=%s, rotation=%d, ui-scale=%g, touchscreen=%s, "
       "input_devices=[%s]",
       static_cast<long long int>(id_), bounds_in_native_.ToString().c_str(),
       size_in_pixel_.ToString().c_str(), device_scale_factor_,
       overscan_insets_in_dip_.ToString().c_str(), rotation_degree,
       configured_ui_scale_,
-      touch_support_ == display::Display::TOUCH_SUPPORT_AVAILABLE
+      touch_support_ == Display::TOUCH_SUPPORT_AVAILABLE
           ? "yes"
-          : touch_support_ == display::Display::TOUCH_SUPPORT_UNAVAILABLE
-                ? "no"
-                : "unknown",
+          : touch_support_ == Display::TOUCH_SUPPORT_UNAVAILABLE ? "no"
+                                                                 : "unknown",
       devices_str.c_str());
 
   return result;
 }
 
 std::string ManagedDisplayInfo::ToFullString() const {
   std::string display_modes_str;
   ManagedDisplayModeList::const_iterator iter = display_modes_.begin();
   for (; iter != display_modes_.end(); ++iter) {
     scoped_refptr<ManagedDisplayMode> m(*iter);
@@ skipping 13 matching lines @@
 }
 
 bool ManagedDisplayInfo::IsColorProfileAvailable(
     ui::ColorCalibrationProfile profile) const {
   return std::find(available_color_profiles_.begin(),
                    available_color_profiles_.end(),
                    profile) != available_color_profiles_.end();
 }
 
 bool ManagedDisplayInfo::Use125DSFForUIScaling() const {
-  return use_125_dsf_for_ui_scaling &&
-         display::Display::IsInternalDisplayId(id_);
+  return use_125_dsf_for_ui_scaling && Display::IsInternalDisplayId(id_);
 }
 
 void ManagedDisplayInfo::AddInputDevice(int id) {
   input_devices_.push_back(id);
 }
 
 void ManagedDisplayInfo::ClearInputDevices() {
   input_devices_.clear();
 }
 
 void ResetDisplayIdForTest() {
   synthesized_display_id = kSynthesizedDisplayIdStart;
 }
 
 }  // namespace display