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

Unified Diff: ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java

Issue 2416403002: Reland of Android: support multiple displays on C++ side (Closed)
Patch Set: Update a map of Displays from Java Created 4 years, 2 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/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java
diff --git a/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java b/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java
index dd86c1e152987fb92f81c3f873db1459a87e09d8..c11b285c774ca2b449f81d7acff77acb557bb9c9 100644
--- a/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java
+++ b/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java
@@ -158,7 +158,11 @@ import org.chromium.ui.gfx.DeviceDisplayInfo;
@Override
public void onDisplayRemoved(int sdkDisplayId) {
- mIdMap.remove(sdkDisplayId);
+ DisplayAndroid displayAndroid = mIdMap.get(sdkDisplayId);
+ if (displayAndroid != null) {
+ displayAndroid.onRemovedFromMap();
+ mIdMap.remove(sdkDisplayId);
+ }
}
@Override
@@ -238,6 +242,8 @@ import org.chromium.ui.gfx.DeviceDisplayInfo;
int sdkDisplayId = display.getDisplayId();
DisplayAndroid displayAndroid = new DisplayAndroid(display);
mIdMap.put(sdkDisplayId, displayAndroid);
+
+ displayAndroid.onAddedToMap();
return displayAndroid;
}
}

Powered by Google App Engine
This is Rietveld 408576698