Commit db9b55f9 authored by Gayane Petrosyan's avatar Gayane Petrosyan Committed by Commit Bot

Disable QR code for incognito

Bug: 1112717
Change-Id: I5a3a74157a41ffb8dcb4b158240cab06c839a5ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342581
Commit-Queue: Gayane Petrosyan <gayane@chromium.org>
Reviewed-by: default avatarTanya Gupta <tgupta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796219}
parent a93247f1
...@@ -151,7 +151,8 @@ class ChromeProvidedSharingOptionsProvider { ...@@ -151,7 +151,8 @@ class ChromeProvidedSharingOptionsProvider {
&& ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARE_HIGHLIGHTS_ANDROID)) { && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARE_HIGHLIGHTS_ANDROID)) {
mOrderedFirstPartyOptions.add(createHighlightsFirstPartyOption()); mOrderedFirstPartyOptions.add(createHighlightsFirstPartyOption());
} }
if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARE_QRCODE)) { if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARE_QRCODE)
&& !mTabProvider.get().getWebContents().isIncognito()) {
mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption()); mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());
} }
if (UserPrefs.get(Profile.getLastUsedRegularProfile()).getBoolean(Pref.PRINTING_ENABLED)) { if (UserPrefs.get(Profile.getLastUsedRegularProfile()).getBoolean(Pref.PRINTING_ENABLED)) {
......
...@@ -25,12 +25,14 @@ import org.mockito.Mock; ...@@ -25,12 +25,14 @@ import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.chromium.base.supplier.Supplier;
import org.chromium.base.test.util.JniMocker; import org.chromium.base.test.util.JniMocker;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ChromeShareExtras; import org.chromium.chrome.browser.share.ChromeShareExtras;
import org.chromium.chrome.browser.share.share_sheet.ShareSheetPropertyModelBuilder.ContentType; import org.chromium.chrome.browser.share.share_sheet.ShareSheetPropertyModelBuilder.ContentType;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.test.ChromeBrowserTestRule; import org.chromium.chrome.test.ChromeBrowserTestRule;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.browser.Features; import org.chromium.chrome.test.util.browser.Features;
...@@ -38,6 +40,7 @@ import org.chromium.components.browser_ui.share.ShareParams; ...@@ -38,6 +40,7 @@ import org.chromium.components.browser_ui.share.ShareParams;
import org.chromium.components.prefs.PrefService; import org.chromium.components.prefs.PrefService;
import org.chromium.components.user_prefs.UserPrefs; import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.components.user_prefs.UserPrefsJni; import org.chromium.components.user_prefs.UserPrefsJni;
import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.test.util.DummyUiActivity; import org.chromium.ui.test.util.DummyUiActivity;
...@@ -77,12 +80,24 @@ public class ChromeProvidedSharingOptionsProviderTest { ...@@ -77,12 +80,24 @@ public class ChromeProvidedSharingOptionsProviderTest {
private Activity mActivity; private Activity mActivity;
private ChromeProvidedSharingOptionsProvider mChromeProvidedSharingOptionsProvider; private ChromeProvidedSharingOptionsProvider mChromeProvidedSharingOptionsProvider;
@Mock
private Supplier<Tab> mTabProvider;
@Mock
private Tab mTab;
@Mock
private WebContents mWebContents;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mJniMocker.mock(UserPrefsJni.TEST_HOOKS, mUserPrefsNatives); mJniMocker.mock(UserPrefsJni.TEST_HOOKS, mUserPrefsNatives);
Profile.setLastUsedProfileForTesting(mProfile); Profile.setLastUsedProfileForTesting(mProfile);
Mockito.when(mUserPrefsNatives.get(mProfile)).thenReturn(mPrefService); Mockito.when(mUserPrefsNatives.get(mProfile)).thenReturn(mPrefService);
Mockito.when(mTabProvider.get()).thenReturn(mTab);
Mockito.when(mTab.getWebContents()).thenReturn(mWebContents);
Mockito.when(mWebContents.isIncognito()).thenReturn(false);
mActivity = mActivityTestRule.getActivity(); mActivity = mActivityTestRule.getActivity();
} }
...@@ -261,14 +276,14 @@ public class ChromeProvidedSharingOptionsProviderTest { ...@@ -261,14 +276,14 @@ public class ChromeProvidedSharingOptionsProviderTest {
private void setUpChromeProvidedSharingOptionsProviderTest(boolean printingEnabled) { private void setUpChromeProvidedSharingOptionsProviderTest(boolean printingEnabled) {
Mockito.when(mPrefService.getBoolean(anyString())).thenReturn(printingEnabled); Mockito.when(mPrefService.getBoolean(anyString())).thenReturn(printingEnabled);
mChromeProvidedSharingOptionsProvider = new ChromeProvidedSharingOptionsProvider(mActivity, mChromeProvidedSharingOptionsProvider =
/*activityTabProvider=*/null, new ChromeProvidedSharingOptionsProvider(mActivity, mTabProvider,
/*bottomSheetController=*/null, /*bottomSheetController=*/null,
new ShareSheetBottomSheetContent(mActivity, mShareSheetCoordinator), new ShareSheetBottomSheetContent(mActivity, mShareSheetCoordinator),
new ShareParams.Builder(null, "", "").build(), new ShareParams.Builder(null, "", "").build(),
new ChromeShareExtras.Builder().build(), new ChromeShareExtras.Builder().build(),
/*TabPrinterDelegate=*/null, /*TabPrinterDelegate=*/null,
/*shareStartTime=*/0, mShareSheetCoordinator); /*shareStartTime=*/0, mShareSheetCoordinator);
} }
private void assertModelsAreInTheRightOrder( private void assertModelsAreInTheRightOrder(
......
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