81 lines
6.1 KiB
Diff
81 lines
6.1 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Thu, 27 Feb 2020 23:23:59 +0100
|
|
Subject: Do not compile QR code sharing
|
|
|
|
---
|
|
.../ChromeProvidedSharingOptionsProvider.java | 16 ----------------
|
|
chrome/browser/share/android/java_sources.gni | 18 ------------------
|
|
2 files changed, 34 deletions(-)
|
|
|
|
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
|
|
--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
|
|
+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
|
|
@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.share.link_to_text.LinkToTextCoordinator;
|
|
import org.chromium.chrome.browser.share.link_to_text.LinkToTextCoordinator.LinkGeneration;
|
|
import org.chromium.chrome.browser.share.link_to_text.LinkToTextMetricsHelper;
|
|
import org.chromium.chrome.browser.share.long_screenshots.LongScreenshotsCoordinator;
|
|
-import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
|
|
import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
|
|
import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
|
|
import org.chromium.chrome.browser.share.share_sheet.ShareSheetPropertyModelBuilder.ContentType;
|
|
@@ -255,9 +254,6 @@ class ChromeProvidedSharingOptionsProvider {
|
|
ChromeFeatureList.PREEMPTIVE_LINK_TO_TEXT_GENERATION)) {
|
|
mOrderedFirstPartyOptions.add(createHighlightsFirstPartyOption());
|
|
}
|
|
- if (!mTabProvider.get().getWebContents().isIncognito()) {
|
|
- mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());
|
|
- }
|
|
if (UserPrefs.get(Profile.getLastUsedRegularProfile()).getBoolean(Pref.PRINTING_ENABLED)) {
|
|
mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption());
|
|
}
|
|
@@ -404,18 +400,6 @@ class ChromeProvidedSharingOptionsProvider {
|
|
.build();
|
|
}
|
|
|
|
- private FirstPartyOption createQrCodeFirstPartyOption() {
|
|
- return new FirstPartyOptionBuilder(
|
|
- ContentType.LINK_PAGE_VISIBLE, ContentType.LINK_PAGE_NOT_VISIBLE, ContentType.IMAGE)
|
|
- .setIcon(R.drawable.qr_code, R.string.qr_code_share_icon_label)
|
|
- .setFeatureNameForMetrics("SharingHubAndroid.QRCodeSelected")
|
|
- .setOnClickCallback((view) -> {
|
|
- QrCodeCoordinator qrCodeCoordinator = new QrCodeCoordinator(mActivity, mUrl);
|
|
- qrCodeCoordinator.show();
|
|
- })
|
|
- .build();
|
|
- }
|
|
-
|
|
private FirstPartyOption createPrintingFirstPartyOption() {
|
|
return new FirstPartyOptionBuilder(ContentType.LINK_PAGE_VISIBLE)
|
|
.setIcon(R.drawable.sharing_print, R.string.print_share_activity_title)
|
|
diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
|
|
--- a/chrome/browser/share/android/java_sources.gni
|
|
+++ b/chrome/browser/share/android/java_sources.gni
|
|
@@ -22,24 +22,6 @@ share_java_sources = [
|
|
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
|
|
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
|
|
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/ScreenshotBoundsManager.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QRCodeGenerationRequest.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/TabLayoutPageListener.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareMediator.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java",
|
|
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java",
|
|
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotSource.java",
|
|
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
|
|
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
|
|
--
|
|
2.17.1
|
|
|