| 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 #ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ | 5 #ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ |
| 6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ | 6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 const std::vector<GammaRampRGBEntry>& degamma_lut, | 49 const std::vector<GammaRampRGBEntry>& degamma_lut, |
| 50 const std::vector<GammaRampRGBEntry>& gamma_lut, | 50 const std::vector<GammaRampRGBEntry>& gamma_lut, |
| 51 const std::vector<float>& correction_matrix); | 51 const std::vector<float>& correction_matrix); |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 DrmDisplay* FindDisplay(int64_t display_id); | 54 DrmDisplay* FindDisplay(int64_t display_id); |
| 55 | 55 |
| 56 // Notify ScreenManager of all the displays that were present before the | 56 // Notify ScreenManager of all the displays that were present before the |
| 57 // update but are gone after the update. | 57 // update but are gone after the update. |
| 58 void NotifyScreenManager( | 58 void NotifyScreenManager( |
| 59 const std::vector<scoped_ptr<DrmDisplay>>& new_displays, | 59 const std::vector<std::unique_ptr<DrmDisplay>>& new_displays, |
| 60 const std::vector<scoped_ptr<DrmDisplay>>& old_displays) const; | 60 const std::vector<std::unique_ptr<DrmDisplay>>& old_displays) const; |
| 61 | 61 |
| 62 ScreenManager* screen_manager_; // Not owned. | 62 ScreenManager* screen_manager_; // Not owned. |
| 63 DrmDeviceManager* drm_device_manager_; // Not owned. | 63 DrmDeviceManager* drm_device_manager_; // Not owned. |
| 64 | 64 |
| 65 std::vector<scoped_ptr<DrmDisplay>> displays_; | 65 std::vector<std::unique_ptr<DrmDisplay>> displays_; |
| 66 | 66 |
| 67 DISALLOW_COPY_AND_ASSIGN(DrmGpuDisplayManager); | 67 DISALLOW_COPY_AND_ASSIGN(DrmGpuDisplayManager); |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 } // namespace ui | 70 } // namespace ui |
| 71 | 71 |
| 72 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ | 72 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ |
| OLD | NEW |