Skip to content

GitLab

T
tangled
Commit 6c0571d8 authored by Side Yilmaz's avatar Side Yilmaz Committed by Commit Bot
Browse files
Options

Replace deprecated getLastUsedProfile function in 

RevampedContextMenuHeader classes.

Profile#getLastUsedProfile| is deprecated and replaced with
|Profile#getLastUsedRegularProfile|. This CL updates
RevampedContextMenuHeader classes by passing the current profile from
RevampedContextMenuCoordinator.

The junit tests of  RevampedContextMenuHeader classes are also updated
by adding mock Profile object to mimic the regular profile.

Bug: 1041781
Change-Id: Iab0f5d900fea3616b5fdcd688335f17d8b757b67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108503
Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org>
Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754084}
parent 7abc6bd2
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 19 deletions
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuCoordinator.java
View file @ 6c0571d8
......@@ -19,6 +19,7 @@ import org.chromium.base.Callback;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.performance_hints.PerformanceHintsObserver;
import org.chromium.chrome.browser.performance_hints.PerformanceHintsObserver.PerformanceClass;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareHelper;
import org.chromium.chrome.browser.share.ShareParams;
import org.chromium.components.browser_ui.widget.ContextMenuDialog;
......@@ -94,8 +95,8 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
? PerformanceHintsObserver.getPerformanceClassForURL(
webContents, params.getLinkUrl())
: PerformanceClass.PERFORMANCE_UNKNOWN;
mHeaderCoordinator =
new RevampedContextMenuHeaderCoordinator(activity, performanceClass, params);
mHeaderCoordinator = new RevampedContextMenuHeaderCoordinator(
activity, performanceClass, params, Profile.fromWebContents(mWebContents));
// The Integer here specifies the {@link ListItemType}.
ModelList listItems = getItemList(window, items, params);
......@@ -255,9 +256,10 @@ public class RevampedContextMenuCoordinator implements ContextMenuUi {
}
@VisibleForTesting
void initializeHeaderCoordinatorForTesting(Activity activity, ContextMenuParams params) {
void initializeHeaderCoordinatorForTesting(
Activity activity, ContextMenuParams params, Profile profile) {
mHeaderCoordinator = new RevampedContextMenuHeaderCoordinator(
activity, PerformanceClass.PERFORMANCE_UNKNOWN, params);
activity, PerformanceClass.PERFORMANCE_UNKNOWN, params, profile);
}
public void clickListItemForTesting(int id) {
......
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuHeaderCoordinator.java
View file @ 6c0571d8
......@@ -28,12 +28,12 @@ class RevampedContextMenuHeaderCoordinator {
private Context mContext;
RevampedContextMenuHeaderCoordinator(
Activity activity, @PerformanceClass int performanceClass, ContextMenuParams params) {
RevampedContextMenuHeaderCoordinator(Activity activity, @PerformanceClass int performanceClass,
ContextMenuParams params, Profile profile) {
mContext = activity;
mModel = buildModel(getTitle(params), getUrl(activity, params));
mMediator =
new RevampedContextMenuHeaderMediator(activity, mModel, performanceClass, params);
mModel = buildModel(getTitle(params), getUrl(activity, params, profile));
mMediator = new RevampedContextMenuHeaderMediator(
activity, mModel, performanceClass, params, profile);
}
private PropertyModel buildModel(String title, CharSequence url) {
......@@ -64,7 +64,7 @@ class RevampedContextMenuHeaderCoordinator {
return "";
}
private CharSequence getUrl(Activity activity, ContextMenuParams params) {
private CharSequence getUrl(Activity activity, ContextMenuParams params, Profile profile) {
CharSequence url = params.getUrl();
if (!TextUtils.isEmpty(url)) {
boolean useDarkColors =
......@@ -78,7 +78,7 @@ class RevampedContextMenuHeaderCoordinator {
SpannableString spannableUrl =
new SpannableString(ChromeContextMenuPopulator.createUrlText(params));
ChromeAutocompleteSchemeClassifier chromeAutocompleteSchemeClassifier =
new ChromeAutocompleteSchemeClassifier(Profile.getLastUsedProfile());
new ChromeAutocompleteSchemeClassifier(profile);
OmniboxUrlEmphasizer.emphasizeUrl(spannableUrl, activity.getResources(),
chromeAutocompleteSchemeClassifier, ConnectionSecurityLevel.NONE, false,
useDarkColors, false);
......
chrome/android/java/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuHeaderMediator.java
View file @ 6c0571d8
......@@ -41,14 +41,14 @@ class RevampedContextMenuHeaderMediator implements View.OnClickListener {
private String mPlainUrl;
RevampedContextMenuHeaderMediator(Context context, PropertyModel model,
@PerformanceClass int performanceClass, ContextMenuParams params) {
@PerformanceClass int performanceClass, ContextMenuParams params, Profile profile) {
mContext = context;
mPlainUrl = params.getUrl();
mModel = model;
mModel.set(RevampedContextMenuHeaderProperties.TITLE_AND_URL_CLICK_LISTENER, this);
if (!params.isImage() && !params.isVideo()) {
LargeIconBridge iconBridge = new LargeIconBridge(Profile.getLastUsedProfile());
LargeIconBridge iconBridge = new LargeIconBridge(profile);
iconBridge.getLargeIconForStringUrl(mPlainUrl,
context.getResources().getDimensionPixelSize(R.dimen.default_favicon_min_size),
this::onFaviconAvailable);
......
chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuCoordinatorTest.java
View file @ 6c0571d8
......@@ -15,6 +15,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.robolectric.Robolectric;
import org.chromium.base.test.BaseRobolectricTestRunner;
......@@ -24,6 +25,7 @@ import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator.ContextMenuGroup;
import org.chromium.chrome.browser.contextmenu.RevampedContextMenuCoordinator.ListItemType;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.components.embedder_support.contextmenu.ContextMenuParams;
import org.chromium.ui.base.ActivityWindowAndroid;
......@@ -45,6 +47,7 @@ public class RevampedContextMenuCoordinatorTest {
private RevampedContextMenuCoordinator mCoordinator;
private Activity mActivity;
private WindowAndroid mWindow;
private final Profile mProfile = Mockito.mock(Profile.class);
@Before
public void setUpTest() {
......@@ -74,7 +77,7 @@ public class RevampedContextMenuCoordinatorTest {
org.chromium.chrome.R.id.contextmenu_share_image, false));
rawItems.add(new Pair<>(ContextMenuGroup.IMAGE, groupTwo));
mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params);
mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params, mProfile);
ModelList itemList = mCoordinator.getItemList(mWindow, rawItems, params);
assertThat(itemList.get(0).type, equalTo(ListItemType.HEADER));
......@@ -107,7 +110,7 @@ public class RevampedContextMenuCoordinatorTest {
org.chromium.chrome.R.id.contextmenu_share_link, true));
rawItems.add(new Pair<>(ContextMenuGroup.LINK, groupOne));
mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params);
mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params, mProfile);
ModelList itemList = mCoordinator.getItemList(mWindow, rawItems, params);
assertThat(itemList.get(0).type, equalTo(ListItemType.HEADER));
......@@ -128,7 +131,7 @@ public class RevampedContextMenuCoordinatorTest {
groupOne.add(new ChromeContextMenuItem(Item.SAVE_VIDEO));
rawItems.add(new Pair<>(ContextMenuGroup.LINK, groupOne));
mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params);
mCoordinator.initializeHeaderCoordinatorForTesting(mActivity, params, mProfile);
ModelList itemList = mCoordinator.getItemList(mWindow, rawItems, params);
assertThat(itemList.get(0).type, equalTo(ListItemType.HEADER));
......
chrome/android/junit/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuHeaderMediatorTest.java
View file @ 6c0571d8
......@@ -14,12 +14,14 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.robolectric.Robolectric;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.blink_public.common.ContextMenuDataMediaType;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.performance_hints.PerformanceHintsObserver.PerformanceClass;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.components.embedder_support.contextmenu.ContextMenuParams;
import org.chromium.ui.modelutil.PropertyModel;
......@@ -33,6 +35,7 @@ public class RevampedContextMenuHeaderMediatorTest {
public TestRule mProcessor = new Features.JUnitProcessor();
private Activity mActivity;
private final Profile mProfile = Mockito.mock(Profile.class);
@Before
public void setUpTest() {
......@@ -51,7 +54,7 @@ public class RevampedContextMenuHeaderMediatorTest {
new ContextMenuParams(ContextMenuDataMediaType.IMAGE, "https://example.org",
"https://example.org/sitemap", "", "", "", "", null, false, 0, 0, 0);
final RevampedContextMenuHeaderMediator mediator = new RevampedContextMenuHeaderMediator(
mActivity, model, PerformanceClass.PERFORMANCE_FAST, params);
mActivity, model, PerformanceClass.PERFORMANCE_FAST, params, mProfile);
assertThat(model.get(RevampedContextMenuHeaderProperties.URL_PERFORMANCE_CLASS),
equalTo(PerformanceClass.PERFORMANCE_FAST));
}
......@@ -68,7 +71,7 @@ public class RevampedContextMenuHeaderMediatorTest {
new ContextMenuParams(ContextMenuDataMediaType.IMAGE, "https://example.org",
"https://example.org/sitemap", "", "", "", "", null, false, 0, 0, 0);
final RevampedContextMenuHeaderMediator mediator = new RevampedContextMenuHeaderMediator(
mActivity, model, PerformanceClass.PERFORMANCE_FAST, params);
mActivity, model, PerformanceClass.PERFORMANCE_FAST, params, mProfile);
assertThat(model.get(RevampedContextMenuHeaderProperties.URL_PERFORMANCE_CLASS),
equalTo(PerformanceClass.PERFORMANCE_UNKNOWN));
}
......@@ -84,7 +87,7 @@ public class RevampedContextMenuHeaderMediatorTest {
final ContextMenuParams params = new ContextMenuParams(ContextMenuDataMediaType.IMAGE,
"https://example.org", "", "", "", "", "", null, false, 0, 0, 0);
final RevampedContextMenuHeaderMediator mediator = new RevampedContextMenuHeaderMediator(
mActivity, model, PerformanceClass.PERFORMANCE_FAST, params);
mActivity, model, PerformanceClass.PERFORMANCE_FAST, params, mProfile);
assertThat(model.get(RevampedContextMenuHeaderProperties.URL_PERFORMANCE_CLASS),
equalTo(PerformanceClass.PERFORMANCE_UNKNOWN));
}
......
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