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_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ | 5 #ifndef UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ |
6 #define UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ | 6 #define UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "base/memory/scoped_vector.h" | 13 #include "base/memory/scoped_vector.h" |
13 #include "ui/display/types/native_display_delegate.h" | 14 #include "ui/display/types/native_display_delegate.h" |
14 | 15 |
15 namespace ui { | 16 namespace ui { |
16 | 17 |
17 class NativeDisplayDelegateOzone : public NativeDisplayDelegate { | 18 class NativeDisplayDelegateOzone : public NativeDisplayDelegate { |
18 public: | 19 public: |
19 NativeDisplayDelegateOzone(); | 20 NativeDisplayDelegateOzone(); |
20 ~NativeDisplayDelegateOzone() override; | 21 ~NativeDisplayDelegateOzone() override; |
21 | 22 |
(...skipping 26 matching lines...) Expand all Loading... |
48 const ui::DisplaySnapshot& output, | 49 const ui::DisplaySnapshot& output, |
49 ui::ColorCalibrationProfile new_profile) override; | 50 ui::ColorCalibrationProfile new_profile) override; |
50 bool SetColorCorrection(const ui::DisplaySnapshot& output, | 51 bool SetColorCorrection(const ui::DisplaySnapshot& output, |
51 const std::vector<GammaRampRGBEntry>& degamma_lut, | 52 const std::vector<GammaRampRGBEntry>& degamma_lut, |
52 const std::vector<GammaRampRGBEntry>& gamma_lut, | 53 const std::vector<GammaRampRGBEntry>& gamma_lut, |
53 const std::vector<float>& correction_matrix) override; | 54 const std::vector<float>& correction_matrix) override; |
54 void AddObserver(NativeDisplayObserver* observer) override; | 55 void AddObserver(NativeDisplayObserver* observer) override; |
55 void RemoveObserver(NativeDisplayObserver* observer) override; | 56 void RemoveObserver(NativeDisplayObserver* observer) override; |
56 | 57 |
57 private: | 58 private: |
58 std::vector<scoped_ptr<DisplaySnapshot>> displays_; | 59 std::vector<std::unique_ptr<DisplaySnapshot>> displays_; |
59 | 60 |
60 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone); | 61 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone); |
61 }; | 62 }; |
62 | 63 |
63 } // namespace ui | 64 } // namespace ui |
64 | 65 |
65 #endif // UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ | 66 #endif // UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ |
OLD | NEW |