Commit 61722682 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Signin][Android] Remove dead code from RecentTabsManager

This CL removes the last usages of
SigninPromoController.arePersonalizedPromosEnabled and the method
itself.

Bug: 792430
Change-Id: Ib169667f755d87fc170b121654c59d50cb5d2b8e
Reviewed-on: https://chromium-review.googlesource.com/844318Reviewed-by: default avatarTed Choc (back but slow, ping me) <tedchoc@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526506}
parent 0867089c
...@@ -8,7 +8,6 @@ import android.accounts.Account; ...@@ -8,7 +8,6 @@ import android.accounts.Account;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.support.annotation.Nullable;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting; import org.chromium.base.VisibleForTesting;
...@@ -82,8 +81,8 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta ...@@ -82,8 +81,8 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta
private UpdatedCallback mUpdatedCallback; private UpdatedCallback mUpdatedCallback;
private boolean mIsDestroyed; private boolean mIsDestroyed;
private final @Nullable ProfileDataCache mProfileDataCache; private final ProfileDataCache mProfileDataCache;
private final @Nullable SigninPromoController mSigninPromoController; private final SigninPromoController mSigninPromoController;
/** /**
* Create an RecentTabsManager to be used with RecentTabsPage and RecentTabsRowAdapter. * Create an RecentTabsManager to be used with RecentTabsPage and RecentTabsRowAdapter.
...@@ -104,14 +103,9 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta ...@@ -104,14 +103,9 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta
mSignInManager = SigninManager.get(context); mSignInManager = SigninManager.get(context);
mContext = context; mContext = context;
if (SigninPromoController.arePersonalizedPromosEnabled()) { int imageSize = context.getResources().getDimensionPixelSize(R.dimen.user_picture_size);
int imageSize = context.getResources().getDimensionPixelSize(R.dimen.user_picture_size); mProfileDataCache = new ProfileDataCache(mContext, imageSize);
mProfileDataCache = new ProfileDataCache(mContext, imageSize); mSigninPromoController = new SigninPromoController(SigninAccessPoint.RECENT_TABS);
mSigninPromoController = new SigninPromoController(SigninAccessPoint.RECENT_TABS);
} else {
mProfileDataCache = null;
mSigninPromoController = null;
}
mRecentlyClosedTabManager.setTabsUpdatedRunnable(() -> { mRecentlyClosedTabManager.setTabsUpdatedRunnable(() -> {
updateRecentlyClosedTabs(); updateRecentlyClosedTabs();
...@@ -137,10 +131,8 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta ...@@ -137,10 +131,8 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta
mSignInManager.removeSignInStateObserver(this); mSignInManager.removeSignInStateObserver(this);
mSignInManager = null; mSignInManager = null;
if (mSigninPromoController != null) { mProfileDataCache.removeObserver(this);
mProfileDataCache.removeObserver(this); AccountManagerFacade.get().removeObserver(this);
AccountManagerFacade.get().removeObserver(this);
}
mFaviconHelper.destroy(); mFaviconHelper.destroy();
mFaviconHelper = null; mFaviconHelper = null;
...@@ -170,10 +162,8 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta ...@@ -170,10 +162,8 @@ public class RecentTabsManager implements AndroidSyncSettingsObserver, SignInSta
AndroidSyncSettings.registerObserver(mContext, this); AndroidSyncSettings.registerObserver(mContext, this);
mSignInManager.addSignInStateObserver(this); mSignInManager.addSignInStateObserver(this);
if (mSigninPromoController != null) { mProfileDataCache.addObserver(this);
mProfileDataCache.addObserver(this); AccountManagerFacade.get().addObserver(this);
AccountManagerFacade.get().addObserver(this);
}
} }
private void updateRecentlyClosedTabs() { private void updateRecentlyClosedTabs() {
......
...@@ -67,14 +67,6 @@ public class SigninPromoController { ...@@ -67,14 +67,6 @@ public class SigninPromoController {
private boolean mWasDisplayed; private boolean mWasDisplayed;
private boolean mWasUsed; private boolean mWasUsed;
/**
* @return Whether the personalized promos experiment is enabled or not.
*/
public static boolean arePersonalizedPromosEnabled() {
// TODO(https://crbug.com/792430): Remove this method and dead code for old promos.
return true;
}
/** /**
* Determines whether the impression limit has been reached for the given access point. * Determines whether the impression limit has been reached for the given access point.
* @param accessPoint The access point for which the impression limit is being checked. * @param accessPoint The access point for which the impression limit is being checked.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment