Fix namespace for src/ui/display/.

ui/display/manager/display_manager.cc

 // Copyright (c) 2012 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/display_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
@@ skipping 377 matching lines @@
   return resolution_changed || display_property_changed;
 }
 
 void DisplayManager::RegisterDisplayProperty(
     int64_t display_id,
     Display::Rotation rotation,
     float ui_scale,
     const gfx::Insets* overscan_insets,
     const gfx::Size& resolution_in_pixels,
     float device_scale_factor,
-    ui::ColorCalibrationProfile color_profile,
+    ColorCalibrationProfile color_profile,
     const TouchCalibrationData* touch_calibration_data) {
   if (display_info_.find(display_id) == display_info_.end())
     display_info_[display_id] =
         ManagedDisplayInfo(display_id, std::string(), false);
 
   // Do not allow rotation in unified desktop mode.
   if (display_id == kUnifiedDisplayId)
     rotation = Display::ROTATE_0;
 
   display_info_[display_id].SetRotation(rotation,
@@ skipping 71 matching lines @@
 
 gfx::Insets DisplayManager::GetOverscanInsets(int64_t display_id) const {
   std::map<int64_t, ManagedDisplayInfo>::const_iterator it =
       display_info_.find(display_id);
   return (it != display_info_.end()) ? it->second.overscan_insets_in_dip()
                                      : gfx::Insets();
 }
 
 void DisplayManager::SetColorCalibrationProfile(
     int64_t display_id,
-    ui::ColorCalibrationProfile profile) {
+    ColorCalibrationProfile profile) {
 #if defined(OS_CHROMEOS)
   if (!display_info_[display_id].IsColorProfileAvailable(profile))
     return;
 
   if (delegate_)
     delegate_->PreDisplayConfigurationChange(false);
   // Just sets color profile if it's not running on ChromeOS (like tests).
   if (!configure_displays_ ||
       delegate_->display_configurator()->SetColorCalibrationProfile(display_id,
                                                                     profile)) {
     display_info_[display_id].SetColorProfile(profile);
     UMA_HISTOGRAM_ENUMERATION("ChromeOS.Display.ColorProfile", profile,
-                              ui::NUM_COLOR_PROFILES);
+                              NUM_COLOR_PROFILES);
   }
   if (delegate_)
     delegate_->PostDisplayConfigurationChange(false);
 #endif
 }
 
 void DisplayManager::OnNativeDisplaysChanged(
     const DisplayInfoList& updated_displays) {
   if (updated_displays.empty()) {
     VLOG(1) << "OnNativeDisplaysChanged(0): # of current displays="
@@ skipping 407 matching lines @@
                                        : kInvalidDisplayId;
 }
 
 void DisplayManager::SetMirrorMode(bool mirror) {
   // TODO(oshima): Enable mirror mode for 2> displays. crbug.com/589319.
   if (num_connected_displays() != 2)
     return;
 
 #if defined(OS_CHROMEOS)
   if (configure_displays_) {
-    ui::MultipleDisplayState new_state =
-        mirror ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR
-               : ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
+    MultipleDisplayState new_state = mirror
+                                         ? MULTIPLE_DISPLAY_STATE_DUAL_MIRROR
+                                         : MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
     delegate_->display_configurator()->SetDisplayMode(new_state);
     return;
   }
 #endif
   multi_display_mode_ =
       mirror ? MIRRORING : current_default_multi_display_mode_;
   ReconfigureDisplays();
 }
 
 void DisplayManager::AddRemoveDisplay() {
@@ skipping 45 matching lines @@
 }
 
 void DisplayManager::SetTouchCalibrationData(
     int64_t display_id,
     const TouchCalibrationData::CalibrationPointPairQuad& point_pair_quad,
     const gfx::Size& display_bounds) {
   bool update = false;
   TouchCalibrationData calibration_data(point_pair_quad, display_bounds);
   DisplayInfoList display_info_list;
   for (const auto& display : active_display_list_) {
-    display::ManagedDisplayInfo info = GetDisplayInfo(display.id());
+    ManagedDisplayInfo info = GetDisplayInfo(display.id());
     if (info.id() == display_id) {
       info.SetTouchCalibrationData(calibration_data);
       update = true;
     }
     display_info_list.push_back(info);
   }
   if (update)
     UpdateDisplaysWith(display_info_list);
   else
     display_info_[display_id].SetTouchCalibrationData(calibration_data);
 }
 
 void DisplayManager::ClearTouchCalibrationData(int64_t display_id) {
   bool update = false;
   DisplayInfoList display_info_list;
   for (const auto& display : active_display_list_) {
-    display::ManagedDisplayInfo info = GetDisplayInfo(display.id());
+    ManagedDisplayInfo info = GetDisplayInfo(display.id());
     if (info.id() == display_id) {
       info.clear_touch_calibration_data();
       update = true;
     }
     display_info_list.push_back(info);
   }
   if (update)
     UpdateDisplaysWith(display_info_list);
   else
     display_info_[display_id].clear_touch_calibration_data();
@@ skipping 286 matching lines @@
       display_info_[new_info.id()].set_configured_ui_scale(0.8f);
     }
   }
   display_info_[new_info.id()].UpdateDisplaySize();
   OnDisplayInfoUpdated(display_info_[new_info.id()]);
 }
 
 void DisplayManager::OnDisplayInfoUpdated(
     const ManagedDisplayInfo& display_info) {
 #if defined(OS_CHROMEOS)
-  ui::ColorCalibrationProfile color_profile = display_info.color_profile();
-  if (color_profile != ui::COLOR_PROFILE_STANDARD) {
+  ColorCalibrationProfile color_profile = display_info.color_profile();
+  if (color_profile != COLOR_PROFILE_STANDARD) {
     delegate_->display_configurator()->SetColorCalibrationProfile(
         display_info.id(), color_profile);
   }
 #endif
 }
 
 Display DisplayManager::CreateDisplayFromDisplayInfoById(int64_t id) {
   DCHECK(display_info_.find(id) != display_info_.end()) << "id=" << id;
   const ManagedDisplayInfo& display_info = display_info_[id];
 
@@ skipping 101 matching lines @@
 }
 
 const Display& DisplayManager::GetSecondaryDisplay() const {
   CHECK_LE(2U, GetNumDisplays());
   return GetDisplayAt(0).id() == Screen::GetScreen()->GetPrimaryDisplay().id()
              ? GetDisplayAt(1)
              : GetDisplayAt(0);
 }
 
 }  // namespace display