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

Unified Diff: ui/ozone/platform/drm/mus_thread_proxy.h

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/host/gpu_thread_adapter.h ('k') | ui/ozone/platform/drm/mus_thread_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/mus_thread_proxy.h
diff --git a/ui/ozone/platform/drm/mus_thread_proxy.h b/ui/ozone/platform/drm/mus_thread_proxy.h
index 3b6168826237a067052fc738ea8aa03814a0818e..2926d268131a587c2e02cbb13d8b823edd411f7d 100644
--- a/ui/ozone/platform/drm/mus_thread_proxy.h
+++ b/ui/ozone/platform/drm/mus_thread_proxy.h
@@ -94,11 +94,11 @@ class MusThreadProxy : public GpuThreadAdapter,
const gfx::Point& point) override;
bool GpuDisableNativeDisplay(int64_t display_id) override;
bool GpuGetHDCPState(int64_t display_id) override;
- bool GpuSetHDCPState(int64_t display_id, ui::HDCPState state) override;
+ bool GpuSetHDCPState(int64_t display_id, display::HDCPState state) override;
bool GpuSetColorCorrection(
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) override;
// Services needed by DrmWindowHost
@@ -133,7 +133,7 @@ class MusThreadProxy : public GpuThreadAdapter,
void GpuRelinquishDisplayControlCallback(bool success) const;
void GpuGetHDCPStateCallback(int64_t display_id,
bool success,
- HDCPState state) const;
+ display::HDCPState state) const;
void GpuSetHDCPStateCallback(int64_t display_id, bool success) const;
scoped_refptr<base::SingleThreadTaskRunner> ws_task_runner_;
« no previous file with comments | « ui/ozone/platform/drm/host/gpu_thread_adapter.h ('k') | ui/ozone/platform/drm/mus_thread_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698