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

Unified Diff: ui/ozone/platform/drm/host/drm_display_host.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
Index: ui/ozone/platform/drm/host/drm_display_host.cc
diff --git a/ui/ozone/platform/drm/host/drm_display_host.cc b/ui/ozone/platform/drm/host/drm_display_host.cc
index b48693fa900fcb0cad9d0a5f4d9b05722b96cb29..daba8d75857a1b93d674c4431062946672e708d6 100644
--- a/ui/ozone/platform/drm/host/drm_display_host.cc
+++ b/ui/ozone/platform/drm/host/drm_display_host.cc
@@ -16,7 +16,7 @@ namespace ui {
namespace {
-DisplayMode_Params GetDisplayModeParams(const DisplayMode& mode) {
+DisplayMode_Params GetDisplayModeParams(const display::DisplayMode& mode) {
DisplayMode_Params params;
params.size = mode.size();
params.is_interlaced = mode.is_interlaced();
@@ -45,9 +45,9 @@ void DrmDisplayHost::UpdateDisplaySnapshot(
snapshot_ = base::MakeUnique<DisplaySnapshotProxy>(params);
}
-void DrmDisplayHost::Configure(const DisplayMode* mode,
+void DrmDisplayHost::Configure(const display::DisplayMode* mode,
const gfx::Point& origin,
- const ConfigureCallback& callback) {
+ const display::ConfigureCallback& callback) {
if (is_dummy_) {
callback.Run(true);
return;
@@ -78,13 +78,15 @@ void DrmDisplayHost::OnDisplayConfigured(bool status) {
configure_callback_.Reset();
}
-void DrmDisplayHost::GetHDCPState(const GetHDCPStateCallback& callback) {
+void DrmDisplayHost::GetHDCPState(
+ const display::GetHDCPStateCallback& callback) {
get_hdcp_callback_ = callback;
if (!sender_->GpuGetHDCPState(snapshot_->display_id()))
- OnHDCPStateReceived(false, HDCP_STATE_UNDESIRED);
+ OnHDCPStateReceived(false, display::HDCP_STATE_UNDESIRED);
}
-void DrmDisplayHost::OnHDCPStateReceived(bool status, HDCPState state) {
+void DrmDisplayHost::OnHDCPStateReceived(bool status,
+ display::HDCPState state) {
if (!get_hdcp_callback_.is_null()) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(get_hdcp_callback_, status, state));
@@ -96,8 +98,9 @@ void DrmDisplayHost::OnHDCPStateReceived(bool status, HDCPState state) {
get_hdcp_callback_.Reset();
}
-void DrmDisplayHost::SetHDCPState(HDCPState state,
- const SetHDCPStateCallback& callback) {
+void DrmDisplayHost::SetHDCPState(
+ display::HDCPState state,
+ const display::SetHDCPStateCallback& callback) {
set_hdcp_callback_ = callback;
if (!sender_->GpuSetHDCPState(snapshot_->display_id(), state))
OnHDCPStateUpdated(false);
@@ -116,8 +119,8 @@ void DrmDisplayHost::OnHDCPStateUpdated(bool status) {
}
void DrmDisplayHost::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) {
sender_->GpuSetColorCorrection(snapshot_->display_id(), degamma_lut,
gamma_lut, correction_matrix);
@@ -139,7 +142,7 @@ void DrmDisplayHost::ClearCallbacks() {
if (!configure_callback_.is_null())
OnDisplayConfigured(false);
if (!get_hdcp_callback_.is_null())
- OnHDCPStateReceived(false, HDCP_STATE_UNDESIRED);
+ OnHDCPStateReceived(false, display::HDCP_STATE_UNDESIRED);
if (!set_hdcp_callback_.is_null())
OnHDCPStateUpdated(false);
}
« no previous file with comments | « ui/ozone/platform/drm/host/drm_display_host.h ('k') | ui/ozone/platform/drm/host/drm_display_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698