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

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

Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove HDCI stuff Created 5 years, 1 month 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 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_HOST_DRM_DISPLAY_HOST_MANAGER_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_MANAGER_H_
6 #define UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_MANAGER_H_ 6 #define UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_MANAGER_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <set> 9 #include <set>
10 10
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // with the GPU process trying to open it and aquire DRM master. 101 // with the GPU process trying to open it and aquire DRM master.
102 base::FilePath primary_graphics_card_path_; 102 base::FilePath primary_graphics_card_path_;
103 103
104 // File path for virtual gem (VGEM) device. 104 // File path for virtual gem (VGEM) device.
105 base::FilePath vgem_card_path_; 105 base::FilePath vgem_card_path_;
106 106
107 // Keeps track if there is a dummy display. This happens on initialization 107 // Keeps track if there is a dummy display. This happens on initialization
108 // when there is no connection to the GPU to update the displays. 108 // when there is no connection to the GPU to update the displays.
109 bool has_dummy_display_ = false; 109 bool has_dummy_display_ = false;
110 110
111 ScopedVector<DrmDisplayHost> displays_; 111 std::vector<scoped_ptr<DrmDisplayHost>> displays_;
112 112
113 GetDisplaysCallback get_displays_callback_; 113 GetDisplaysCallback get_displays_callback_;
114 114
115 bool display_externally_controlled_ = false; 115 bool display_externally_controlled_ = false;
116 bool display_control_change_pending_ = false; 116 bool display_control_change_pending_ = false;
117 DisplayControlCallback take_display_control_callback_; 117 DisplayControlCallback take_display_control_callback_;
118 DisplayControlCallback relinquish_display_control_callback_; 118 DisplayControlCallback relinquish_display_control_callback_;
119 119
120 // Used to serialize display event processing. This is done since 120 // Used to serialize display event processing. This is done since
121 // opening/closing DRM devices cannot be done on the UI thread and are handled 121 // opening/closing DRM devices cannot be done on the UI thread and are handled
(...skipping 12 matching lines...) Expand all
134 scoped_ptr<DrmDeviceHandle> primary_drm_device_handle_; 134 scoped_ptr<DrmDeviceHandle> primary_drm_device_handle_;
135 135
136 base::WeakPtrFactory<DrmDisplayHostManager> weak_ptr_factory_; 136 base::WeakPtrFactory<DrmDisplayHostManager> weak_ptr_factory_;
137 137
138 DISALLOW_COPY_AND_ASSIGN(DrmDisplayHostManager); 138 DISALLOW_COPY_AND_ASSIGN(DrmDisplayHostManager);
139 }; 139 };
140 140
141 } // namespace ui 141 } // namespace ui
142 142
143 #endif // UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_MANAGER_H_ 143 #endif // UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_MANAGER_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_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698