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

Unified Diff: ui/ozone/platform/dri/chromeos/native_display_delegate_dri.cc

Issue 377753002: [Ozone-GBM] Add basic support for display configuration over IPC (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
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());

Powered by Google App Engine
This is Rietveld 408576698