| OLD | NEW |
| 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/common/display_snapshot_proxy.h" | 5 #include "ui/ozone/common/display_snapshot_proxy.h" |
| 6 | 6 |
| 7 #include "ui/ozone/common/display_mode_proxy.h" | 7 #include "ui/ozone/common/display_mode_proxy.h" |
| 8 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" | 8 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" |
| 9 | 9 |
| 10 namespace ui { | 10 namespace ui { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 modes_.push_back(new DisplayModeProxy(params.modes[i])); | 34 modes_.push_back(new DisplayModeProxy(params.modes[i])); |
| 35 | 35 |
| 36 if (params.has_current_mode && | 36 if (params.has_current_mode && |
| 37 SameModes(params.modes[i], params.current_mode)) | 37 SameModes(params.modes[i], params.current_mode)) |
| 38 current_mode_ = modes_.back(); | 38 current_mode_ = modes_.back(); |
| 39 | 39 |
| 40 if (params.has_native_mode && | 40 if (params.has_native_mode && |
| 41 SameModes(params.modes[i], params.native_mode)) | 41 SameModes(params.modes[i], params.native_mode)) |
| 42 native_mode_ = modes_.back(); | 42 native_mode_ = modes_.back(); |
| 43 } | 43 } |
| 44 |
| 45 product_id_ = params.product_id; |
| 44 } | 46 } |
| 45 | 47 |
| 46 DisplaySnapshotProxy::~DisplaySnapshotProxy() { | 48 DisplaySnapshotProxy::~DisplaySnapshotProxy() { |
| 47 } | 49 } |
| 48 | 50 |
| 49 std::string DisplaySnapshotProxy::ToString() const { | 51 std::string DisplaySnapshotProxy::ToString() const { |
| 50 return string_representation_; | 52 return string_representation_; |
| 51 } | 53 } |
| 52 | 54 |
| 53 } // namespace ui | 55 } // namespace ui |
| OLD | NEW |