chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java - Issue 2455653002: Make clear that WindowAndroid::getDisplay must be used when supporting multi-display.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java

Issue 2455653002: Make clear that WindowAndroid::getDisplay must be used when supporting multi-display. (Closed)

Patch Set: Revert change that snuck in from other branch 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

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java ('k') | content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java

index 199e0bec9fd3a5c3ef94f6149b91df56e8dd617b..973240d83ebf916c59c5cfd61736183279a632ff 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java

@@ -45,7 +45,7 @@ public class ProfileDataCache implements Observer {

public String givenName;

}

- private final HashMap<String, CacheEntry> mCacheEntries = new HashMap<String, CacheEntry>();

+ private final HashMap<String, CacheEntry> mCacheEntries = new HashMap<>();

private final Bitmap mPlaceholderImage;

private final int mImageSizePx;

@@ -62,7 +62,8 @@ public class ProfileDataCache implements Observer {

mContext = context;

mProfile = profile;

- final DisplayAndroid displayAndroid = DisplayAndroid.get(context);

+ // There's no WindowAndroid present at this time, so get the default display.

+ final DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(context);

mImageSizePx = (int) Math.ceil(PROFILE_IMAGE_SIZE_DP * displayAndroid.getDIPScale());

mImageStrokePx = (int) Math.ceil(PROFILE_IMAGE_STROKE_DP * displayAndroid.getDIPScale());

mImageStrokeColor = Color.WHITE;