123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104 |
- 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/browser/ui/RootUiCoordinator.java | 5 -----
- .../ChromeProvidedSharingOptionsProvider.java | 17 -----------------
- chrome/browser/share/android/java_sources.gni | 18 ------------------
- 3 files changed, 40 deletions(-)
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
- @@ -82,7 +82,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
- import org.chromium.chrome.browser.share.ShareDelegate;
- import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
- import org.chromium.chrome.browser.share.ShareUtils;
- -import org.chromium.chrome.browser.share.qrcode.QrCodeDialog;
- import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
- import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
- import org.chromium.chrome.browser.tab.Tab;
- @@ -421,10 +420,6 @@ public class RootUiCoordinator
- }
-
- public void onAttachFragment(Fragment fragment) {
- - if (fragment instanceof QrCodeDialog) {
- - QrCodeDialog qrCodeDialog = (QrCodeDialog) fragment;
- - qrCodeDialog.setAndroidPermissionDelegate(mWindowAndroid);
- - }
- }
-
- @Override
- 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
- @@ -26,7 +26,6 @@ import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.share.SaveBitmapDelegate;
- import org.chromium.chrome.browser.share.link_to_text.LinkToTextCoordinator.LinkGeneration;
- 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.ShareSheetLinkToggleMetricsHelper.LinkToggleMetricsDetails;
- @@ -274,9 +273,6 @@ public class ChromeProvidedSharingOptionsProvider {
- mOrderedFirstPartyOptions.add(createCopyFirstPartyOption());
- mOrderedFirstPartyOptions.add(createCopyTextFirstPartyOption());
- mOrderedFirstPartyOptions.add(createSendTabToSelfFirstPartyOption());
- - if (!mTabProvider.get().getWebContents().isIncognito()) {
- - mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());
- - }
- if (UserPrefs.get(Profile.getLastUsedRegularProfile()).getBoolean(Pref.PRINTING_ENABLED)) {
- mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption());
- }
- @@ -400,19 +396,6 @@ public 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, mTabProvider.get().getWindowAndroid());
- - 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
- @@ -24,24 +24,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.20.1
|