e_patches: Update the patch that were causing conflicts

From 7ed1ed8394ad3e65e7e12848174fa1ed05d2f9cf Mon Sep 17 00:00:00 2001

From ec773a7bd6032ccf317c4e4d3eca698f779facfb Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Wed, 2 Oct 2024 11:41:48 +0530

Subject: Browser: Fix open in browser text

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 .../chromium/chrome/browser/DefaultBrowserInfo.java    | 10 +++++++---

 .../chrome/browser/DefaultBrowserMenuUtils.java        | 10 +++++++---

 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserInfo.java

index d310cf1f0fcd7..487ef1dfabc9a 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserInfo.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserInfo.java

@@ -90,9 +90,13 @@ public final class DefaultBrowserInfo {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserMenuUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserMenuUtils.java

index 5f45e5d6b1ab5..ce756af13e3c0 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserMenuUtils.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserMenuUtils.java

@@ -50,8 +50,12 @@ public final class DefaultBrowserMenuUtils {

     }

     private static String getTitleFromPackageLabel(Context context, @Nullable String packageLabel) {

+            return context.getString(R.string.menu_open_in_product, packageLabel);

+        }

     }

     /**

 }

-- 

2.34.1

2.53.0

From 28f304f608a9902d74c6878f1f8618de00a61c6f Mon Sep 17 00:00:00 2001

From b9a8105d902f8282fe2749ad0a732e53bdf83ef5 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 20 Oct 2023 18:23:09 +0530

Subject: Browser: Remove send to devices option

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 ...omeProvidedSharingOptionsProviderBase.java | 43 -------------------

 1 file changed, 43 deletions(-)

 ...omeProvidedSharingOptionsProviderBase.java | 40 -------------------

 1 file changed, 40 deletions(-)

diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java

index 4ee543a7c51d8..d06246de55d13 100644

index a15903ec91f08..47d0a2a947c77 100644

--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java

+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java

@@ -280,7 +280,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {

@@ -300,7 +300,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {

             }

             maybeAddPrintFirstPartyOption();

         }

         maybeAddQrCodeFirstPartyOption();

     }

@@ -294,14 +293,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {

@@ -314,14 +313,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {

         }

     }

     private void maybeAddQrCodeFirstPartyOption() {

     }

@@ -410,40 +401,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {

@@ -430,37 +421,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {

                 .build();

     }

-                .setFeatureNameForMetrics(USER_ACTION_SEND_TAB_TO_SELF_SELECTED)

-                .setOnClickCallback(

-                        (view) -> {

-                            Tab tab = mTabProvider.get();

-                            PageContext pageContext =

-                                    (tab != null && TextUtils.equals(mUrl, tab.getUrl().getSpec()))

-                                            ? SendTabToSelfAndroidBridge.createPageContext(

-                                                    tab.getWebContents())

-                                            :

-                                            /* pageContext= */ null;

-                            SendTabToSelfCoordinator sttsCoordinator =

-                                    new SendTabToSelfCoordinator(

-                                            mActivity,

-                                            mWindowAndroid,

-                                            mUrl,

-                                            mShareParams.getTitle(),

-                                            pageContext,

-                                            mBottomSheetController,

-                                            mProfile,

-                                            mDeviceLockActivityLauncher,

-                                            mTabProvider);

-                                            mTabProvider,

-                                            mActivity,

-                                            mSigninAndHistorySyncActivityLauncher,

-                                            mActivityResultTracker,

-                                            mModalDialogManagerSupplier,

-                                            mSnackbarManager);

-                            sttsCoordinator.show();

-                        })

-                .build();