Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Side by Side Diff: ui/ozone/platform/drm/host/drm_display_host.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_HOST_DRM_DISPLAY_HOST_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_H_
6 #define UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_H_ 6 #define UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/display/types/display_constants.h" 11 #include "ui/display/types/display_constants.h"
11 #include "ui/display/types/native_display_delegate.h" 12 #include "ui/display/types/native_display_delegate.h"
12 #include "ui/ozone/platform/drm/host/gpu_thread_observer.h" 13 #include "ui/ozone/platform/drm/host/gpu_thread_observer.h"
13 14
14 namespace ui { 15 namespace ui {
15 16
16 struct DisplaySnapshot_Params; 17 struct DisplaySnapshot_Params;
17 class DisplaySnapshot; 18 class DisplaySnapshot;
18 class GpuThreadAdapter; 19 class GpuThreadAdapter;
19 20
(...skipping 25 matching lines...) Expand all
45 // GpuThreadObserver: 46 // GpuThreadObserver:
46 void OnGpuThreadReady() override; 47 void OnGpuThreadReady() override;
47 void OnGpuThreadRetired() override; 48 void OnGpuThreadRetired() override;
48 49
49 private: 50 private:
50 // Calls all the callbacks with failure. 51 // Calls all the callbacks with failure.
51 void ClearCallbacks(); 52 void ClearCallbacks();
52 53
53 GpuThreadAdapter* sender_; // Not owned. 54 GpuThreadAdapter* sender_; // Not owned.
54 55
55 scoped_ptr<DisplaySnapshot> snapshot_; 56 std::unique_ptr<DisplaySnapshot> snapshot_;
56 57
57 // Used during startup to signify that any display configuration should be 58 // Used during startup to signify that any display configuration should be
58 // synchronous and succeed. 59 // synchronous and succeed.
59 bool is_dummy_; 60 bool is_dummy_;
60 61
61 ConfigureCallback configure_callback_; 62 ConfigureCallback configure_callback_;
62 GetHDCPStateCallback get_hdcp_callback_; 63 GetHDCPStateCallback get_hdcp_callback_;
63 SetHDCPStateCallback set_hdcp_callback_; 64 SetHDCPStateCallback set_hdcp_callback_;
64 65
65 DISALLOW_COPY_AND_ASSIGN(DrmDisplayHost); 66 DISALLOW_COPY_AND_ASSIGN(DrmDisplayHost);
66 }; 67 };
67 68
68 } // namespace ui 69 } // namespace ui
69 70
70 #endif // UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_H_ 71 #endif // UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/gpu/screen_manager_unittest.cc ('k') | ui/ozone/platform/drm/host/drm_display_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698