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

Unified Diff: ui/ozone/platform/drm/mus_thread_proxy.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/mus_thread_proxy.h ('k') | ui/ozone/platform/drm/ozone_platform_gbm.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.cc
diff --git a/ui/ozone/platform/drm/mus_thread_proxy.cc b/ui/ozone/platform/drm/mus_thread_proxy.cc
index 299acbd6c113feb24ce06f32b0320df4a1669eb8..ad701e4e38313733ab4c5a37def929e73a48294a 100644
--- a/ui/ozone/platform/drm/mus_thread_proxy.cc
+++ b/ui/ozone/platform/drm/mus_thread_proxy.cc
@@ -290,7 +290,8 @@ bool MusThreadProxy::GpuGetHDCPState(int64_t display_id) {
return true;
}
-bool MusThreadProxy::GpuSetHDCPState(int64_t display_id, HDCPState state) {
+bool MusThreadProxy::GpuSetHDCPState(int64_t display_id,
+ display::HDCPState state) {
DCHECK(on_window_server_thread_.CalledOnValidThread());
DCHECK(drm_thread_->IsRunning());
auto callback = base::Bind(&MusThreadProxy::GpuSetHDCPStateCallback,
@@ -304,8 +305,8 @@ bool MusThreadProxy::GpuSetHDCPState(int64_t display_id, HDCPState state) {
bool MusThreadProxy::GpuSetColorCorrection(
int64_t 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) {
DCHECK(drm_thread_->IsRunning());
DCHECK(on_window_server_thread_.CalledOnValidThread());
@@ -353,7 +354,7 @@ void MusThreadProxy::GpuRelinquishDisplayControlCallback(bool success) const {
void MusThreadProxy::GpuGetHDCPStateCallback(int64_t display_id,
bool success,
- HDCPState state) const {
+ display::HDCPState state) const {
DCHECK(on_window_server_thread_.CalledOnValidThread());
display_manager_->GpuReceivedHDCPState(display_id, success, state);
}
« no previous file with comments | « ui/ozone/platform/drm/mus_thread_proxy.h ('k') | ui/ozone/platform/drm/ozone_platform_gbm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698