From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 27 Feb 2020 23:23:59 +0100 Subject: Do not compile QR code sharing --- chrome/android/java/AndroidManifest.xml | 16 ---------------- .../chrome/browser/share/ShareDelegateImpl.java | 5 ----- .../browser/share/ShareSheetCoordinator.java | 14 -------------- chrome/browser/share/android/java_sources.gni | 12 ------------ 4 files changed, 47 deletions(-) diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -824,22 +824,6 @@ by a child template that "extends" this file. - - - - - - - triggerShare(currentTab, shareDirectly, isIncognito)); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java @@ -16,7 +16,6 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity; -import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator; import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabLaunchType; @@ -73,19 +72,6 @@ public class ShareSheetCoordinator { ArrayList createTopRowPropertyModels( ShareSheetBottomSheetContent bottomSheet, Activity activity) { ArrayList models = new ArrayList<>(); - // QR Codes - PropertyModel qrcodePropertyModel = mPropertyModelBuilder.createPropertyModel( - AppCompatResources.getDrawable(activity, R.drawable.qr_code), - activity.getResources().getString(R.string.qr_code_share_icon_label), - (currentActivity) - -> { - mBottomSheetController.hideContent(bottomSheet, true); - QrCodeCoordinator qrCodeCoordinator = - new QrCodeCoordinator(activity, this::createNewTab); - qrCodeCoordinator.show(); - }, - /*isFirstParty=*/true); - models.add(qrcodePropertyModel); // Send Tab To Self PropertyModel sttsPropertyModel = 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 @@ -4,18 +4,6 @@ # TODO(gayane): This should be a separate build target when circular dependencies are removed. share_java_sources = [ - "//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/QrCodeShareActivity.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/QrCodeShareView.java", ] -- 2.17.1