Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h ('k') | ui/ozone/platform/drm/gpu/drm_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
index a508170eb7e6b26d0e1682e688ca85d50658460a..0d406a964f7e48ec847cebb0ffacef0a34e74ee6 100644
--- a/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
+++ b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
@@ -174,7 +174,8 @@ bool DrmGpuDisplayManager::DisableDisplay(int64_t display_id) {
return display->Configure(nullptr, gfx::Point());
}
-bool DrmGpuDisplayManager::GetHDCPState(int64_t display_id, HDCPState* state) {
+bool DrmGpuDisplayManager::GetHDCPState(int64_t display_id,
+ display::HDCPState* state) {
DrmDisplay* display = FindDisplay(display_id);
if (!display) {
LOG(ERROR) << "There is no display with ID " << display_id;
@@ -184,7 +185,8 @@ bool DrmGpuDisplayManager::GetHDCPState(int64_t display_id, HDCPState* state) {
return display->GetHDCPState(state);
}
-bool DrmGpuDisplayManager::SetHDCPState(int64_t display_id, HDCPState state) {
+bool DrmGpuDisplayManager::SetHDCPState(int64_t display_id,
+ display::HDCPState state) {
DrmDisplay* display = FindDisplay(display_id);
if (!display) {
LOG(ERROR) << "There is no display with ID " << display_id;
@@ -196,8 +198,8 @@ bool DrmGpuDisplayManager::SetHDCPState(int64_t display_id, HDCPState state) {
void DrmGpuDisplayManager::SetColorCorrection(
int64_t display_id,
- 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) {
DrmDisplay* display = FindDisplay(display_id);
if (!display) {
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h ('k') | ui/ozone/platform/drm/gpu/drm_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698