Fix namespace for src/ui/display/.

ui/ozone/platform/drm/gpu/drm_display.cc

 // Copyright 2015 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/ozone/platform/drm/gpu/drm_display.h"
 
 #include <xf86drmMode.h>
 
 #include "base/macros.h"
 #include "ui/display/types/gamma_ramp_rgb_entry.h"
 #include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 
 namespace ui {
 
 namespace {
 
 const char kContentProtection[] = "Content Protection";
 
 struct ContentProtectionMapping {
   const char* name;
-  HDCPState state;
+  display::HDCPState state;
 };
 
 const ContentProtectionMapping kContentProtectionStates[] = {
-    {"Undesired", HDCP_STATE_UNDESIRED},
-    {"Desired", HDCP_STATE_DESIRED},
-    {"Enabled", HDCP_STATE_ENABLED}};
+    {"Undesired", display::HDCP_STATE_UNDESIRED},
+    {"Desired", display::HDCP_STATE_DESIRED},
+    {"Enabled", display::HDCP_STATE_ENABLED}};
 
 // Converts |state| to the DRM value associated with the it.
 uint32_t GetContentProtectionValue(drmModePropertyRes* property,
-                                   HDCPState state) {
+                                   display::HDCPState state) {
   std::string name;
   for (size_t i = 0; i < arraysize(kContentProtectionStates); ++i) {
     if (kContentProtectionStates[i].state == state) {
       name = kContentProtectionStates[i].name;
       break;
     }
   }
 
   for (int i = 0; i < property->count_enums; ++i)
     if (name == property->enums[i].name)
@@ skipping 72 matching lines @@
       VLOG(1) << "Failed to disable device=" << drm_->device_path().value()
               << " crtc=" << crtc_;
       return false;
     }
   }
 
   origin_ = origin;
   return true;
 }
 
-bool DrmDisplay::GetHDCPState(HDCPState* state) {
+bool DrmDisplay::GetHDCPState(display::HDCPState* state) {
   ScopedDrmConnectorPtr connector(drm_->GetConnector(connector_));
   if (!connector) {
     PLOG(ERROR) << "Failed to get connector " << connector_;
     return false;
   }
 
   ScopedDrmPropertyPtr hdcp_property(
       drm_->GetProperty(connector.get(), kContentProtection));
   if (!hdcp_property) {
     PLOG(ERROR) << "'" << kContentProtection << "' property doesn't exist.";
     return false;
   }
 
   std::string name =
       GetEnumNameForProperty(connector.get(), hdcp_property.get());
   for (size_t i = 0; i < arraysize(kContentProtectionStates); ++i) {
     if (name == kContentProtectionStates[i].name) {
       *state = kContentProtectionStates[i].state;
       VLOG(3) << "HDCP state: " << *state << " (" << name << ")";
       return true;
     }
   }
 
   LOG(ERROR) << "Unknown content protection value '" << name << "'";
   return false;
 }
 
-bool DrmDisplay::SetHDCPState(HDCPState state) {
+bool DrmDisplay::SetHDCPState(display::HDCPState state) {
   ScopedDrmConnectorPtr connector(drm_->GetConnector(connector_));
   if (!connector) {
     PLOG(ERROR) << "Failed to get connector " << connector_;
     return false;
   }
 
   ScopedDrmPropertyPtr hdcp_property(
       drm_->GetProperty(connector.get(), kContentProtection));
   if (!hdcp_property) {
     LOG(ERROR) << "'" << kContentProtection << "' property doesn't exist.";
     return false;
   }
 
   return drm_->SetProperty(
       connector_, hdcp_property->prop_id,
       GetContentProtectionValue(hdcp_property.get(), state));
 }
 
 void DrmDisplay::SetColorCorrection(
-    const std::vector<GammaRampRGBEntry>& degamma_lut,
-    const std::vector<GammaRampRGBEntry>& gamma_lut,
+    const std::vector<display::GammaRampRGBEntry>& degamma_lut,
+    const std::vector<display::GammaRampRGBEntry>& gamma_lut,
     const std::vector<float>& correction_matrix) {
   if (!drm_->SetColorCorrection(crtc_, degamma_lut, gamma_lut,
                                 correction_matrix)) {
     LOG(ERROR) << "Failed to set color correction for display: crtc_id = "
                << crtc_;
   }
 }
 
 }  // namespace ui