[Android] Add configurable image size support to ProfileDataCache

This CL replaces hard-coded image size in ProfileDataCache with a constructor
parameter and fixes its usages.

Bug: 746519
Change-Id: I1a663d4f9a1d9e6a57a73a3db12701c75ef09219
Reviewed-on: https://chromium-review.googlesource.com/591649Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490733}

chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java

@@ -41,8 +41,9 @@ public class AccountFirstRunFragment extends FirstRunPage implements AccountSign
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        int imageSize = getResources().getDimensionPixelSize(R.dimen.signin_account_image_size);
         ProfileDataCache profileDataCache =
-                new ProfileDataCache(getActivity(), Profile.getLastUsedProfile());
+                new ProfileDataCache(getActivity(), Profile.getLastUsedProfile(), imageSize);
         boolean isChildAccount = getProperties().getBoolean(IS_CHILD_ACCOUNT);
         String forceAccountTo = getProperties().getString(FORCE_SIGNIN_ACCOUNT_TO);
         AccountSigninView.Listener listener = new AccountSigninView.Listener() {

chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

@@ -53,7 +53,9 @@ public class SignInPreference
      */
     public SignInPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mProfileDataCache = new ProfileDataCache(context, Profile.getLastUsedProfile());
+
+        int imageSize = context.getResources().getDimensionPixelSize(R.dimen.user_picture_size);
+        mProfileDataCache = new ProfileDataCache(context, Profile.getLastUsedProfile(), imageSize);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninActivity.java

@@ -122,8 +122,9 @@ public class AccountSigninActivity extends AppCompatActivity
         mView = (AccountSigninView) LayoutInflater.from(this).inflate(
                 R.layout.account_signin_view, null);
 
+        int imageSize = getResources().getDimensionPixelSize(R.dimen.signin_account_image_size);
         ProfileDataCache profileDataCache =
-                new ProfileDataCache(this, Profile.getLastUsedProfile());
+                new ProfileDataCache(this, Profile.getLastUsedProfile(), imageSize);
         String selectAccount = getIntent().getStringExtra(INTENT_SELECT_ACCOUNT);
         if (selectAccount == null) {
             mView.initFromSelectionPage(profileDataCache, false, this, this);

chrome/android/java/src/org/chromium/chrome/browser/signin/ProfileDataCache.java

@@ -57,17 +57,17 @@ public class ProfileDataCache implements ProfileDownloader.Observer {
         public String givenName;
     }
 
-    private final HashMap<String, CacheEntry> mCacheEntries = new HashMap<>();
-
+    private final Context mContext;
+    private final Profile mProfile;
+    private final int mImageSize;
     private final Drawable mPlaceholderImage;
     private final ObserverList<Observer> mObservers = new ObserverList<>();
+    private final HashMap<String, CacheEntry> mCacheEntries = new HashMap<>();
 
-    private final Context mContext;
-    private Profile mProfile;
-
-    public ProfileDataCache(Context context, Profile profile) {
+    public ProfileDataCache(Context context, Profile profile, int imageSize) {
         mContext = context;
         mProfile = profile;
+        mImageSize = imageSize;
 
         mPlaceholderImage =
                 AppCompatResources.getDrawable(context, R.drawable.logo_avatar_anonymous);
@@ -82,12 +82,10 @@ public class ProfileDataCache implements ProfileDownloader.Observer {
         ThreadUtils.assertOnUiThread();
         assert !mObservers.isEmpty();
 
-        int imageSizePx =
-                mContext.getResources().getDimensionPixelSize(R.dimen.signin_account_image_size);
         for (int i = 0; i < accounts.size(); i++) {
             if (mCacheEntries.get(accounts.get(i)) == null) {
                 ProfileDownloader.startFetchingAccountInfoFor(
-                        mContext, mProfile, accounts.get(i), imageSizePx, true);
+                        mContext, mProfile, accounts.get(i), mImageSize, true);
             }
         }
     }