Index: ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc |
diff --git a/ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc b/ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc |
index f765cd3c9dad7a81073e411e947d9c8fdc93d9e9..fff9defdba1f346a76d7b4aaa09546572fc05157 100644 |
--- a/ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc |
+++ b/ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc |
@@ -32,11 +32,21 @@ NativeDisplayDelegateDri::NativeDisplayDelegateDri( |
} |
NativeDisplayDelegateDri::~NativeDisplayDelegateDri() { |
- device_manager_->RemoveObserver(this); |
+ if (device_manager_) |
+ device_manager_->RemoveObserver(this); |
+} |
+ |
+DisplaySnapshot* NativeDisplayDelegateDri::FindDisplaySnapshot(int64_t id) { |
+ for (size_t i = 0; i < cached_displays_.size(); ++i) |
+ if (cached_displays_[i]->display_id() == id) |
+ return cached_displays_[i]; |
+ |
+ return NULL; |
} |
void NativeDisplayDelegateDri::Initialize() { |
- device_manager_->AddObserver(this); |
+ if (device_manager_) |
+ device_manager_->AddObserver(this); |
ScopedVector<HardwareDisplayControllerInfo> displays = |
GetAvailableDisplayControllerInfos(dri_->get_fd()); |