| Index: ui/ozone/common/display_snapshot_proxy.cc
|
| diff --git a/ui/ozone/common/display_snapshot_proxy.cc b/ui/ozone/common/display_snapshot_proxy.cc
|
| index 415d53f7886d0092cd0af8fe85bd6adf1bf7906c..88ef6cc377ff5c7a4fa5b5aaf236d1f87fbfbf30 100644
|
| --- a/ui/ozone/common/display_snapshot_proxy.cc
|
| +++ b/ui/ozone/common/display_snapshot_proxy.cc
|
| @@ -22,7 +22,7 @@ bool SameModes(const DisplayMode_Params& lhs, const DisplayMode_Params& rhs) {
|
| } // namespace
|
|
|
| DisplaySnapshotProxy::DisplaySnapshotProxy(const DisplaySnapshot_Params& params)
|
| - : DisplaySnapshot(
|
| + : DisplaySnapshotMojo(
|
| params.display_id,
|
| params.origin,
|
| params.physical_size,
|
| @@ -34,9 +34,9 @@ DisplaySnapshotProxy::DisplaySnapshotProxy(const DisplaySnapshot_Params& params)
|
| params.sys_path,
|
| std::vector<std::unique_ptr<const display::DisplayMode>>(),
|
| params.edid,
|
| - NULL,
|
| - NULL),
|
| - string_representation_(params.string_representation) {
|
| + nullptr,
|
| + nullptr,
|
| + params.string_representation) {
|
| for (size_t i = 0; i < params.modes.size(); ++i) {
|
| modes_.push_back(base::MakeUnique<display::DisplayMode>(
|
| params.modes[i].size, params.modes[i].is_interlaced,
|
| @@ -58,8 +58,4 @@ DisplaySnapshotProxy::DisplaySnapshotProxy(const DisplaySnapshot_Params& params)
|
| DisplaySnapshotProxy::~DisplaySnapshotProxy() {
|
| }
|
|
|
| -std::string DisplaySnapshotProxy::ToString() const {
|
| - return string_representation_;
|
| -}
|
| -
|
| } // namespace ui
|
|
|