Fix namespace for src/ui/display/.

chrome/browser/chromeos/display/display_preferences.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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include <stddef.h>
 
 #include "ash/display/display_pref_util.h"
 #include "ash/display/json_converter.h"
@@ skipping 133 matching lines @@
     if (row != touch_calibration_data.point_pairs.size() - 1)
       str += " ";
   }
   value->SetString(kTouchCalibrationPointPairs, str);
   value->SetInteger(kTouchCalibrationWidth,
                     touch_calibration_data.bounds.width());
   value->SetInteger(kTouchCalibrationHeight,
                     touch_calibration_data.bounds.height());
 }
 
-std::string ColorProfileToString(ui::ColorCalibrationProfile profile) {
+std::string ColorProfileToString(display::ColorCalibrationProfile profile) {
   switch (profile) {
-    case ui::COLOR_PROFILE_STANDARD:
+    case display::COLOR_PROFILE_STANDARD:
       return "standard";
-    case ui::COLOR_PROFILE_DYNAMIC:
+    case display::COLOR_PROFILE_DYNAMIC:
       return "dynamic";
-    case ui::COLOR_PROFILE_MOVIE:
+    case display::COLOR_PROFILE_MOVIE:
       return "movie";
-    case ui::COLOR_PROFILE_READING:
+    case display::COLOR_PROFILE_READING:
       return "reading";
-    case ui::NUM_COLOR_PROFILES:
+    case display::NUM_COLOR_PROFILES:
       break;
   }
   NOTREACHED();
   return "";
 }
 
-ui::ColorCalibrationProfile StringToColorProfile(const std::string& value) {
+display::ColorCalibrationProfile StringToColorProfile(
+    const std::string& value) {
   if (value == "standard")
-    return ui::COLOR_PROFILE_STANDARD;
+    return display::COLOR_PROFILE_STANDARD;
   else if (value == "dynamic")
-    return ui::COLOR_PROFILE_DYNAMIC;
+    return display::COLOR_PROFILE_DYNAMIC;
   else if (value == "movie")
-    return ui::COLOR_PROFILE_MOVIE;
+    return display::COLOR_PROFILE_MOVIE;
   else if (value == "reading")
-    return ui::COLOR_PROFILE_READING;
+    return display::COLOR_PROFILE_READING;
   NOTREACHED();
-  return ui::COLOR_PROFILE_STANDARD;
+  return display::COLOR_PROFILE_STANDARD;
 }
 
 display::DisplayManager* GetDisplayManager() {
   return ash::Shell::GetInstance()->display_manager();
 }
 
 // Returns true id the current user can write display preferences to
 // Local State.
 bool UserCanSaveDisplayPreference() {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
@@ skipping 73 matching lines @@
 
     gfx::Insets insets;
     if (ValueToInsets(*dict_value, &insets))
       insets_to_set = &insets;
 
     display::TouchCalibrationData calibration_data;
     display::TouchCalibrationData* calibration_data_to_set = nullptr;
     if (ValueToTouchData(*dict_value, &calibration_data))
       calibration_data_to_set = &calibration_data;
 
-    ui::ColorCalibrationProfile color_profile = ui::COLOR_PROFILE_STANDARD;
+    display::ColorCalibrationProfile color_profile =
+        display::COLOR_PROFILE_STANDARD;
     std::string color_profile_name;
     if (dict_value->GetString("color_profile_name", &color_profile_name))
       color_profile = StringToColorProfile(color_profile_name);
     GetDisplayManager()->RegisterDisplayProperty(
         id, rotation, ui_scale, insets_to_set, resolution_in_pixels,
         device_scale_factor, color_profile, calibration_data_to_set);
   }
 }
 
 void LoadDisplayRotationState() {
@@ skipping 72 matching lines @@
         display_manager->GetSelectedModeForDisplayId(id);
     if (!display.IsInternal() && mode && !mode->native()) {
       property_value->SetInteger("width", mode->size().width());
       property_value->SetInteger("height", mode->size().height());
       property_value->SetInteger(
           "device-scale-factor",
           static_cast<int>(mode->device_scale_factor() * 1000));
     }
     if (!info.overscan_insets_in_dip().IsEmpty())
       InsetsToValue(info.overscan_insets_in_dip(), property_value.get());
-    if (info.color_profile() != ui::COLOR_PROFILE_STANDARD) {
+    if (info.color_profile() != display::COLOR_PROFILE_STANDARD) {
       property_value->SetString(
           "color_profile_name", ColorProfileToString(info.color_profile()));
     }
     if (info.has_touch_calibration_data())
       TouchDataToValue(info.GetTouchCalibrationData(), property_value.get());
     pref_data->Set(base::Int64ToString(id), property_value.release());
   }
 }
 
 typedef std::map<chromeos::DisplayPowerState, std::string>
@@ skipping 110 matching lines @@
   StoreDisplayPowerState(power_state);
 }
 
 bool ParseTouchCalibrationStringForTest(
     const std::string& str,
     display::TouchCalibrationData::CalibrationPointPairQuad* point_pair_quad) {
   return ParseTouchCalibrationStringValue(str, point_pair_quad);
 }
 
 }  // namespace chromeos