| 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 "base/memory/scoped_vector.h" | 8 #include "base/memory/scoped_vector.h" |
| 9 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" | 9 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 bool DisableDisplay(int64_t id); | 36 bool DisableDisplay(int64_t id); |
| 37 bool GetHDCPState(int64_t display_id, HDCPState* state); | 37 bool GetHDCPState(int64_t display_id, HDCPState* state); |
| 38 bool SetHDCPState(int64_t display_id, HDCPState state); | 38 bool SetHDCPState(int64_t display_id, HDCPState state); |
| 39 void SetGammaRamp(int64_t id, const std::vector<GammaRampRGBEntry>& lut); | 39 void SetGammaRamp(int64_t id, const std::vector<GammaRampRGBEntry>& lut); |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 DrmDisplay* FindDisplay(int64_t display_id); | 42 DrmDisplay* FindDisplay(int64_t display_id); |
| 43 | 43 |
| 44 // Notify ScreenManager of all the displays that were present before the | 44 // Notify ScreenManager of all the displays that were present before the |
| 45 // update but are gone after the update. | 45 // update but are gone after the update. |
| 46 void NotifyScreenManager(const std::vector<DrmDisplay*>& new_displays, | 46 void NotifyScreenManager( |
| 47 const std::vector<DrmDisplay*>& old_displays) const; | 47 const std::vector<scoped_ptr<DrmDisplay>>& new_displays, |
| 48 const std::vector<scoped_ptr<DrmDisplay>>& old_displays) const; |
| 48 | 49 |
| 49 ScreenManager* screen_manager_; // Not owned. | 50 ScreenManager* screen_manager_; // Not owned. |
| 50 DrmDeviceManager* drm_device_manager_; // Not owned. | 51 DrmDeviceManager* drm_device_manager_; // Not owned. |
| 51 | 52 |
| 52 ScopedVector<DrmDisplay> displays_; | 53 std::vector<scoped_ptr<DrmDisplay>> displays_; |
| 53 | 54 |
| 54 DISALLOW_COPY_AND_ASSIGN(DrmGpuDisplayManager); | 55 DISALLOW_COPY_AND_ASSIGN(DrmGpuDisplayManager); |
| 55 }; | 56 }; |
| 56 | 57 |
| 57 } // namespace ui | 58 } // namespace ui |
| 58 | 59 |
| 59 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ | 60 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_ |
| OLD | NEW |