Do-not-compile-QR-code-sharing.patch 7.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Thu, 27 Feb 2020 23:23:59 +0100
  3. Subject: Do not compile QR code sharing
  4. ---
  5. .../chrome/browser/ui/RootUiCoordinator.java | 5 -----
  6. .../ChromeProvidedSharingOptionsProvider.java | 17 -----------------
  7. chrome/browser/share/android/java_sources.gni | 18 ------------------
  8. 3 files changed, 40 deletions(-)
  9. 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
  10. --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
  11. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
  12. @@ -82,7 +82,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
  13. import org.chromium.chrome.browser.share.ShareDelegate;
  14. import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
  15. import org.chromium.chrome.browser.share.ShareUtils;
  16. -import org.chromium.chrome.browser.share.qrcode.QrCodeDialog;
  17. import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  18. import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
  19. import org.chromium.chrome.browser.tab.Tab;
  20. @@ -421,10 +420,6 @@ public class RootUiCoordinator
  21. }
  22. public void onAttachFragment(Fragment fragment) {
  23. - if (fragment instanceof QrCodeDialog) {
  24. - QrCodeDialog qrCodeDialog = (QrCodeDialog) fragment;
  25. - qrCodeDialog.setAndroidPermissionDelegate(mWindowAndroid);
  26. - }
  27. }
  28. @Override
  29. 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
  30. --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
  31. +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
  32. @@ -26,7 +26,6 @@ import org.chromium.chrome.browser.profiles.Profile;
  33. import org.chromium.chrome.browser.share.SaveBitmapDelegate;
  34. import org.chromium.chrome.browser.share.link_to_text.LinkToTextCoordinator.LinkGeneration;
  35. import org.chromium.chrome.browser.share.long_screenshots.LongScreenshotsCoordinator;
  36. -import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
  37. import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
  38. import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
  39. import org.chromium.chrome.browser.share.share_sheet.ShareSheetLinkToggleMetricsHelper.LinkToggleMetricsDetails;
  40. @@ -274,9 +273,6 @@ public class ChromeProvidedSharingOptionsProvider {
  41. mOrderedFirstPartyOptions.add(createCopyFirstPartyOption());
  42. mOrderedFirstPartyOptions.add(createCopyTextFirstPartyOption());
  43. mOrderedFirstPartyOptions.add(createSendTabToSelfFirstPartyOption());
  44. - if (!mTabProvider.get().getWebContents().isIncognito()) {
  45. - mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());
  46. - }
  47. if (UserPrefs.get(Profile.getLastUsedRegularProfile()).getBoolean(Pref.PRINTING_ENABLED)) {
  48. mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption());
  49. }
  50. @@ -400,19 +396,6 @@ public class ChromeProvidedSharingOptionsProvider {
  51. .build();
  52. }
  53. - private FirstPartyOption createQrCodeFirstPartyOption() {
  54. - return new FirstPartyOptionBuilder(
  55. - ContentType.LINK_PAGE_VISIBLE, ContentType.LINK_PAGE_NOT_VISIBLE, ContentType.IMAGE)
  56. - .setIcon(R.drawable.qr_code, R.string.qr_code_share_icon_label)
  57. - .setFeatureNameForMetrics("SharingHubAndroid.QRCodeSelected")
  58. - .setOnClickCallback((view) -> {
  59. - QrCodeCoordinator qrCodeCoordinator = new QrCodeCoordinator(
  60. - mActivity, mUrl, mTabProvider.get().getWindowAndroid());
  61. - qrCodeCoordinator.show();
  62. - })
  63. - .build();
  64. - }
  65. -
  66. private FirstPartyOption createPrintingFirstPartyOption() {
  67. return new FirstPartyOptionBuilder(ContentType.LINK_PAGE_VISIBLE)
  68. .setIcon(R.drawable.sharing_print, R.string.print_share_activity_title)
  69. diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
  70. --- a/chrome/browser/share/android/java_sources.gni
  71. +++ b/chrome/browser/share/android/java_sources.gni
  72. @@ -24,24 +24,6 @@ share_java_sources = [
  73. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
  74. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
  75. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/ScreenshotBoundsManager.java",
  76. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QRCodeGenerationRequest.java",
  77. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
  78. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
  79. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
  80. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
  81. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/TabLayoutPageListener.java",
  82. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
  83. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
  84. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
  85. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
  86. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
  87. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
  88. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
  89. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
  90. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareMediator.java",
  91. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
  92. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java",
  93. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java",
  94. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotSource.java",
  95. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
  96. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
  97. --
  98. 2.20.1