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

Side by Side Diff: ui/ozone/platform/drm/host/drm_native_display_delegate.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/ozone/platform/drm/host/drm_native_display_delegate.h" 5 #include "ui/ozone/platform/drm/host/drm_native_display_delegate.h"
6 6
7 #include "ui/display/types/display_snapshot.h" 7 #include "ui/display/types/display_snapshot.h"
8 #include "ui/display/types/native_display_observer.h" 8 #include "ui/display/types/native_display_observer.h"
9 #include "ui/ozone/platform/drm/host/drm_display_host.h" 9 #include "ui/ozone/platform/drm/host/drm_display_host.h"
10 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h" 10 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h"
11 11
12 namespace ui { 12 namespace ui {
13 13
14 DrmNativeDisplayDelegate::DrmNativeDisplayDelegate( 14 DrmNativeDisplayDelegate::DrmNativeDisplayDelegate(
15 DrmDisplayHostManager* display_manager) 15 DrmDisplayHostManager* display_manager)
16 : display_manager_(display_manager) { 16 : display_manager_(display_manager) {
17 } 17 }
18 18
19 DrmNativeDisplayDelegate::~DrmNativeDisplayDelegate() { 19 DrmNativeDisplayDelegate::~DrmNativeDisplayDelegate() {
20 display_manager_->RemoveDelegate(this); 20 display_manager_->RemoveDelegate(this);
21 } 21 }
22 22
23 void DrmNativeDisplayDelegate::OnConfigurationChanged() { 23 void DrmNativeDisplayDelegate::OnConfigurationChanged() {
24 for (NativeDisplayObserver& observer : observers_) 24 for (display::NativeDisplayObserver& observer : observers_)
25 observer.OnConfigurationChanged(); 25 observer.OnConfigurationChanged();
26 } 26 }
27 27
28 void DrmNativeDisplayDelegate::OnDisplaySnapshotsInvalidated() { 28 void DrmNativeDisplayDelegate::OnDisplaySnapshotsInvalidated() {
29 for (NativeDisplayObserver& observer : observers_) 29 for (display::NativeDisplayObserver& observer : observers_)
30 observer.OnDisplaySnapshotsInvalidated(); 30 observer.OnDisplaySnapshotsInvalidated();
31 } 31 }
32 32
33 void DrmNativeDisplayDelegate::Initialize() { 33 void DrmNativeDisplayDelegate::Initialize() {
34 display_manager_->AddDelegate(this); 34 display_manager_->AddDelegate(this);
35 } 35 }
36 36
37 void DrmNativeDisplayDelegate::GrabServer() { 37 void DrmNativeDisplayDelegate::GrabServer() {
38 } 38 }
39 39
40 void DrmNativeDisplayDelegate::UngrabServer() { 40 void DrmNativeDisplayDelegate::UngrabServer() {
41 } 41 }
42 42
43 void DrmNativeDisplayDelegate::TakeDisplayControl( 43 void DrmNativeDisplayDelegate::TakeDisplayControl(
44 const DisplayControlCallback& callback) { 44 const display::DisplayControlCallback& callback) {
45 display_manager_->TakeDisplayControl(callback); 45 display_manager_->TakeDisplayControl(callback);
46 } 46 }
47 47
48 void DrmNativeDisplayDelegate::RelinquishDisplayControl( 48 void DrmNativeDisplayDelegate::RelinquishDisplayControl(
49 const DisplayControlCallback& callback) { 49 const display::DisplayControlCallback& callback) {
50 display_manager_->RelinquishDisplayControl(callback); 50 display_manager_->RelinquishDisplayControl(callback);
51 } 51 }
52 52
53 void DrmNativeDisplayDelegate::SyncWithServer() { 53 void DrmNativeDisplayDelegate::SyncWithServer() {
54 } 54 }
55 55
56 void DrmNativeDisplayDelegate::SetBackgroundColor(uint32_t color_argb) { 56 void DrmNativeDisplayDelegate::SetBackgroundColor(uint32_t color_argb) {
57 } 57 }
58 58
59 void DrmNativeDisplayDelegate::ForceDPMSOn() { 59 void DrmNativeDisplayDelegate::ForceDPMSOn() {
60 } 60 }
61 61
62 void DrmNativeDisplayDelegate::GetDisplays( 62 void DrmNativeDisplayDelegate::GetDisplays(
63 const GetDisplaysCallback& callback) { 63 const display::GetDisplaysCallback& callback) {
64 display_manager_->UpdateDisplays(callback); 64 display_manager_->UpdateDisplays(callback);
65 } 65 }
66 66
67 void DrmNativeDisplayDelegate::AddMode(const ui::DisplaySnapshot& output, 67 void DrmNativeDisplayDelegate::AddMode(const display::DisplaySnapshot& output,
68 const ui::DisplayMode* mode) { 68 const display::DisplayMode* mode) {}
69 }
70 69
71 void DrmNativeDisplayDelegate::Configure(const ui::DisplaySnapshot& output, 70 void DrmNativeDisplayDelegate::Configure(
72 const ui::DisplayMode* mode, 71 const display::DisplaySnapshot& output,
73 const gfx::Point& origin, 72 const display::DisplayMode* mode,
74 const ConfigureCallback& callback) { 73 const gfx::Point& origin,
74 const display::ConfigureCallback& callback) {
75 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id()); 75 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id());
76 display->Configure(mode, origin, callback); 76 display->Configure(mode, origin, callback);
77 } 77 }
78 78
79 void DrmNativeDisplayDelegate::CreateFrameBuffer(const gfx::Size& size) { 79 void DrmNativeDisplayDelegate::CreateFrameBuffer(const gfx::Size& size) {
80 } 80 }
81 81
82 void DrmNativeDisplayDelegate::GetHDCPState( 82 void DrmNativeDisplayDelegate::GetHDCPState(
83 const ui::DisplaySnapshot& output, 83 const display::DisplaySnapshot& output,
84 const GetHDCPStateCallback& callback) { 84 const display::GetHDCPStateCallback& callback) {
85 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id()); 85 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id());
86 display->GetHDCPState(callback); 86 display->GetHDCPState(callback);
87 } 87 }
88 88
89 void DrmNativeDisplayDelegate::SetHDCPState( 89 void DrmNativeDisplayDelegate::SetHDCPState(
90 const ui::DisplaySnapshot& output, 90 const display::DisplaySnapshot& output,
91 ui::HDCPState state, 91 display::HDCPState state,
92 const SetHDCPStateCallback& callback) { 92 const display::SetHDCPStateCallback& callback) {
93 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id()); 93 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id());
94 display->SetHDCPState(state, callback); 94 display->SetHDCPState(state, callback);
95 } 95 }
96 96
97 std::vector<ui::ColorCalibrationProfile> 97 std::vector<display::ColorCalibrationProfile>
98 DrmNativeDisplayDelegate::GetAvailableColorCalibrationProfiles( 98 DrmNativeDisplayDelegate::GetAvailableColorCalibrationProfiles(
99 const ui::DisplaySnapshot& output) { 99 const display::DisplaySnapshot& output) {
100 return std::vector<ui::ColorCalibrationProfile>(); 100 return std::vector<display::ColorCalibrationProfile>();
101 } 101 }
102 102
103 bool DrmNativeDisplayDelegate::SetColorCalibrationProfile( 103 bool DrmNativeDisplayDelegate::SetColorCalibrationProfile(
104 const ui::DisplaySnapshot& output, 104 const display::DisplaySnapshot& output,
105 ui::ColorCalibrationProfile new_profile) { 105 display::ColorCalibrationProfile new_profile) {
106 NOTIMPLEMENTED(); 106 NOTIMPLEMENTED();
107 return false; 107 return false;
108 } 108 }
109 109
110 bool DrmNativeDisplayDelegate::SetColorCorrection( 110 bool DrmNativeDisplayDelegate::SetColorCorrection(
111 const ui::DisplaySnapshot& output, 111 const display::DisplaySnapshot& output,
112 const std::vector<GammaRampRGBEntry>& degamma_lut, 112 const std::vector<display::GammaRampRGBEntry>& degamma_lut,
113 const std::vector<GammaRampRGBEntry>& gamma_lut, 113 const std::vector<display::GammaRampRGBEntry>& gamma_lut,
114 const std::vector<float>& correction_matrix) { 114 const std::vector<float>& correction_matrix) {
115 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id()); 115 DrmDisplayHost* display = display_manager_->GetDisplay(output.display_id());
116 display->SetColorCorrection(degamma_lut, gamma_lut, correction_matrix); 116 display->SetColorCorrection(degamma_lut, gamma_lut, correction_matrix);
117 return true; 117 return true;
118 } 118 }
119 119
120 void DrmNativeDisplayDelegate::AddObserver(NativeDisplayObserver* observer) { 120 void DrmNativeDisplayDelegate::AddObserver(
121 display::NativeDisplayObserver* observer) {
121 observers_.AddObserver(observer); 122 observers_.AddObserver(observer);
122 } 123 }
123 124
124 void DrmNativeDisplayDelegate::RemoveObserver(NativeDisplayObserver* observer) { 125 void DrmNativeDisplayDelegate::RemoveObserver(
126 display::NativeDisplayObserver* observer) {
125 observers_.RemoveObserver(observer); 127 observers_.RemoveObserver(observer);
126 } 128 }
127 129
128 display::FakeDisplayController* 130 display::FakeDisplayController*
129 DrmNativeDisplayDelegate::GetFakeDisplayController() { 131 DrmNativeDisplayDelegate::GetFakeDisplayController() {
130 return nullptr; 132 return nullptr;
131 } 133 }
132 134
133 } // namespace ui 135 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/host/drm_native_display_delegate.h ('k') | ui/ozone/platform/drm/host/drm_window_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698