Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f027a58 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Fix patches that are not applying and causing conflicts

parent 4c92ef1c
Loading
Loading
Loading
Loading
+18 −9
Original line number Diff line number Diff line
From e75dada7dd9605fa14e783e9c43e7ae16551e294 Mon Sep 17 00:00:00 2001
From 28f304f608a9902d74c6878f1f8618de00a61c6f 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 | 34 -------------------
 1 file changed, 34 deletions(-)
 ...omeProvidedSharingOptionsProviderBase.java | 43 -------------------
 1 file changed, 43 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 e2a5627ac3bf4..75f0b028e6274 100644
index 4ee543a7c51d8..d06246de55d13 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
@@ -279,7 +279,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
@@ -280,7 +280,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
             }
             maybeAddPrintFirstPartyOption();
         }
@@ -20,7 +20,7 @@ index e2a5627ac3bf4..75f0b028e6274 100644
         maybeAddQrCodeFirstPartyOption();
     }
 
@@ -293,14 +292,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
@@ -294,14 +293,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
         }
     }
 
@@ -35,7 +35,7 @@ index e2a5627ac3bf4..75f0b028e6274 100644
     private void maybeAddQrCodeFirstPartyOption() {
     }
 
@@ -409,31 +400,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
@@ -410,40 +401,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
                 .build();
     }
 
@@ -50,15 +50,24 @@ index e2a5627ac3bf4..75f0b028e6274 100644
-                .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);
-                                            mDeviceLockActivityLauncher,
-                                            mTabProvider);
-                            sttsCoordinator.show();
-                        })
-                .build();
@@ -68,5 +77,5 @@ index e2a5627ac3bf4..75f0b028e6274 100644
         return new FirstPartyOptionBuilder(ContentType.LINK_PAGE_VISIBLE)
                 .setIcon(R.drawable.sharing_print, R.string.print_share_activity_title)
-- 
2.34.1
2.53.0
+14 −51
Original line number Diff line number Diff line
From 5bb8a5046c00fd8c8ae738e1964c40f353c8270d Mon Sep 17 00:00:00 2001
From 45cadfed3bbc96afa10df1c7335f20873aff49f6 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 20 Feb 2024 20:35:25 +0530
Subject: Change accent and switch to match our palette
@@ -9,9 +9,6 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com>
 .../java/res/layout/improved_bookmark_save_flow.xml      | 2 +-
 .../keyboard_accessory_sheet_tab_option_toggle.xml       | 2 +-
 .../android/java/res/layout/readaloud_toggle_switch.xml  | 2 +-
 .../res/layout/fast_checkout_autofill_profile_item.xml   | 2 +-
 .../java/res/layout/fast_checkout_credit_card_item.xml   | 2 +-
 .../java/res/layout/fast_checkout_footer_item.xml        | 2 +-
 .../chrome/browser/omnibox/UrlBarViewBinder.java         | 2 +-
 .../browser/omnibox/styles/OmniboxResourceProvider.java  | 2 +-
 .../account_picker_bottom_sheet_new_account_row.xml      | 2 +-
@@ -28,7 +25,7 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com>
 .../widget/android/java/res/layout/preference_switch.xml | 2 +-
 .../android/res/layout/infobar_control_toggle.xml        | 2 +-
 ui/android/java/res/values/color_palette.xml             | 8 ++++++--
 23 files changed, 66 insertions(+), 24 deletions(-)
 20 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100644 components/browser_ui/styles/android/java/res/color/e_switch_thumb_color.xml
 create mode 100644 components/browser_ui/styles/android/java/res/color/e_switch_track_color.xml
 create mode 100644 components/browser_ui/styles/android/java/res/drawable/e_switch_thumb.xml
@@ -107,45 +104,11 @@ index e980248bb75e2..59bf07c11172c 100644
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toggle_switch"
     android:layout_width="wrap_content"
diff --git a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml
index 8521910dd154b..e7fe84b68c599 100644
--- a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml
+++ b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml
@@ -87,6 +87,6 @@ found in the LICENSE file.
         android:layout_marginEnd="@dimen/fast_checkout_detail_sheet_selected_icon_margin_end"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null"
-        app:tint="?attr/colorPrimary"
+        app:tint="@color/default_control_color_active_baseline"
         app:srcCompat="@drawable/ic_check_circle_filled_green_24dp" />
 </LinearLayout>
diff --git a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml
index 4e9e8deb14885..ab4d39f056a55 100644
--- a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml
+++ b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml
@@ -57,6 +57,6 @@ found in the LICENSE file.
         android:layout_marginEnd="@dimen/fast_checkout_detail_sheet_selected_icon_margin_end"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null"
-        app:tint="?attr/colorPrimary"
+        app:tint="@color/default_control_color_active_baseline"
         app:srcCompat="@drawable/ic_check_circle_filled_green_24dp" />
 </LinearLayout>
diff --git a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml
index 5cf2ef6aa513b..2a83ae31aed43 100644
--- a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml
+++ b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml
@@ -20,4 +20,4 @@ found in the LICENSE file.
     android:drawablePadding="@dimen/fast_checkout_detail_sheet_footer_icon_margin_horizontal"
     app:drawableWidth="24dp"
     app:drawableHeight="24dp"
-    app:drawableTint="?attr/colorPrimary" />
+    app:drawableTint="@color/default_control_color_active_baseline" />
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java
index 8d92f3f41a45e..f9e087e9a9c9c 100644
index b35165820115e..b57823ca8c967 100644
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java
@@ -173,7 +173,7 @@ class UrlBarViewBinder {
@@ -190,7 +190,7 @@ class UrlBarViewBinder {
         final int color =
                 useIncognitoColors
                         ? view.getContext().getColor(R.color.default_control_color_active_dark)
@@ -155,7 +118,7 @@ index 8d92f3f41a45e..f9e087e9a9c9c 100644
         textSelectHandle.mutate().setTint(color);
         textSelectHandleLeft.mutate().setTint(color);
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java
index cba1b14211209..f539dafc602eb 100644
index 45d658674a27f..a24348d99a54b 100644
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java
@@ -399,7 +399,7 @@ public class OmniboxResourceProvider {
@@ -178,7 +141,7 @@ index b9570b7802f1e..b6f8b814a802d 100644
-    app:drawableTint="?attr/colorPrimary" />
+    app:drawableTint="@color/default_control_color_active_baseline" />
diff --git a/components/browser_ui/styles/android/BUILD.gn b/components/browser_ui/styles/android/BUILD.gn
index 01ce0d27646f6..191d029e540a3 100644
index f23599d2bd41b..32e55f02c5017 100644
--- a/components/browser_ui/styles/android/BUILD.gn
+++ b/components/browser_ui/styles/android/BUILD.gn
@@ -83,6 +83,8 @@ android_resources("java_resources") {
@@ -190,7 +153,7 @@ index 01ce0d27646f6..191d029e540a3 100644
     "java/res/drawable-hdpi/ic_logo_googleg_24dp.png",
     "java/res/drawable-hdpi/ic_open_in_new_white_24dp.png",
     "java/res/drawable-hdpi/ic_pause_white_36dp.png",
@@ -245,6 +247,8 @@ android_resources("java_resources") {
@@ -263,6 +265,8 @@ android_resources("java_resources") {
     "java/res/drawable/secured_by_brand_shield_24.xml",
     "java/res/drawable/smartphone_black_24dp.xml",
     "java/res/drawable/toolbar_hairline.xml",
@@ -291,7 +254,7 @@ index dd9b5c34cabb8..b5b6d9d017ab0 100644
     <macro name="default_text_color_on_accent1_container">?attr/colorOnPrimaryContainer</macro>
     <macro name="default_text_color_on_accent2_container">?attr/colorOnSecondaryContainer</macro>
diff --git a/components/browser_ui/styles/android/java/res/values/styles.xml b/components/browser_ui/styles/android/java/res/values/styles.xml
index 33c655a1f1150..3b5542c3dab38 100644
index 69bf9aae826c7..5f1799574612a 100644
--- a/components/browser_ui/styles/android/java/res/values/styles.xml
+++ b/components/browser_ui/styles/android/java/res/values/styles.xml
@@ -20,9 +20,13 @@ found in the LICENSE file.
@@ -322,10 +285,10 @@ index 9220d7081c925..c5e3108058850 100644
         <!-- android:textColorHighlight applied by Material3 is too dark, so we override it with our
              own color state list to specify a lower alpha. -->
diff --git a/components/browser_ui/theme/android/templates/res/values/themes.xml b/components/browser_ui/theme/android/templates/res/values/themes.xml
index 5e782ea84da7d..5aaa0c0c17b87 100644
index a6e0b696dd4a5..65decb8790bf4 100644
--- a/components/browser_ui/theme/android/templates/res/values/themes.xml
+++ b/components/browser_ui/theme/android/templates/res/values/themes.xml
@@ -61,7 +61,7 @@ Note: This is a jinja2 template, processed at build time into the final resource
@@ -63,7 +63,7 @@ Note: This is a jinja2 template, processed at build time into the final resource
         <!-- Elevation overlays -->
         <item name="elevationOverlayEnabled">true</item>
         <item name="elevationOverlayColor">@color/gm3_baseline_surface_tint</item>
@@ -334,7 +297,7 @@ index 5e782ea84da7d..5aaa0c0c17b87 100644
 
         <item name="android:listChoiceBackgroundIndicator">@drawable/list_item_ripple</item>
 
@@ -92,7 +92,7 @@ Note: This is a jinja2 template, processed at build time into the final resource
@@ -94,7 +94,7 @@ Note: This is a jinja2 template, processed at build time into the final resource
         <!-- Control styles -->
         <item name="checkboxStyle">@style/Widget.BrowserUI.CheckBox</item>
         <item name="radioButtonStyle">@style/Widget.BrowserUI.RadioButton</item>
@@ -370,7 +333,7 @@ index 209d2a1568df5..c615ca94ceffa 100644
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/ui/android/java/res/values/color_palette.xml b/ui/android/java/res/values/color_palette.xml
index 21b6f3dc7b9d3..6c5dfd7e7032a 100644
index 2d700f659c2dc..949cde86a3244 100644
--- a/ui/android/java/res/values/color_palette.xml
+++ b/ui/android/java/res/values/color_palette.xml
@@ -11,13 +11,13 @@ found in the LICENSE file.
@@ -389,7 +352,7 @@ index 21b6f3dc7b9d3..6c5dfd7e7032a 100644
     <color name="baseline_primary_40_alpha_6">#0F0B57D0</color>
     <color name="baseline_primary_40_alpha_10">#190B57D0</color>
     <color name="baseline_primary_40_alpha_12">#1F0B57D0</color>
@@ -173,4 +173,8 @@ found in the LICENSE file.
@@ -174,4 +174,8 @@ found in the LICENSE file.
     <color name="material_tertiary_80">@color/baseline_tertiary_80</color>
     <color name="material_tertiary_40">@color/baseline_tertiary_40</color>
 
@@ -399,5 +362,5 @@ index 21b6f3dc7b9d3..6c5dfd7e7032a 100644
+    <color name="e_switch_track_off">#C8CED0</color>
 </resources>
-- 
2.52.0
2.53.0
+37 −38
Original line number Diff line number Diff line
From b99b1056f384dc3e88a899cfc844c5207d7d1167 Mon Sep 17 00:00:00 2001
From 891f57c45c5793cce009890c4e6e744ca05ccd06 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 26 Sep 2021 11:17:53 +0200
Subject: Disable AGSA by default
@@ -12,15 +12,15 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com>
 ...CustomTabActivityClientConnectionKeeper.java | 16 ++++------------
 .../SafeBrowsingReferringAppBridge.java         |  2 --
 .../chrome/browser/share/LensUtils.java         | 17 ++---------------
 .../chrome/browser/ui/RootUiCoordinator.java    | 17 -----------------
 .../chrome/browser/ui/RootUiCoordinator.java    | 16 ----------------
 .../flags/android/chrome_feature_list.cc        |  2 +-
 8 files changed, 7 insertions(+), 63 deletions(-)
 8 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 54c913c81985a..0c9682392de80 100644
index e12f25685d880..959599aba2e62 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -401,7 +401,6 @@ if (_is_default_toolchain) {
@@ -421,7 +421,6 @@ if (_is_default_toolchain) {
       "//chrome/browser/flags:java",
       "//chrome/browser/fullscreen/android:java",
       "//chrome/browser/gesturenav/android:java",
@@ -29,7 +29,7 @@ index 54c913c81985a..0c9682392de80 100644
       "//chrome/browser/history_clusters:java",
       "//chrome/browser/hub:factory_java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
index e377314a4f35d..a81b916aaf06b 100644
index de2748857a34a..31210ed6096cd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
@@ -40,7 +40,7 @@ index e377314a4f35d..a81b916aaf06b 100644
 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.pdf.PdfUtils;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -306,9 +305,6 @@ public class IntentHandler {
@@ -310,9 +309,6 @@ public class IntentHandler {
     public static final String EXTRA_TIPS_NOTIFICATION_FEATURE_TYPE =
             "org.chromium.chrome.browser.tips_notification_feature_type";
 
@@ -50,7 +50,7 @@ index e377314a4f35d..a81b916aaf06b 100644
     /** Action to launch the Chrome Item Picker UI, e.g.: tabs. */
     public static final String EXTRA_OPEN_CHROME_ITEM_PICKER =
             "org.chromium.chrome.browser.actions.open_chrome_item_picker";
@@ -367,7 +363,6 @@ public class IntentHandler {
@@ -368,7 +364,6 @@ public class IntentHandler {
         ExternalAppId.NEWS,
         ExternalAppId.LINE,
         ExternalAppId.WHATSAPP,
@@ -58,7 +58,7 @@ index e377314a4f35d..a81b916aaf06b 100644
         ExternalAppId.WEBAPK,
         ExternalAppId.YAHOO_MAIL,
         ExternalAppId.VIBER,
@@ -391,7 +386,6 @@ public class IntentHandler {
@@ -392,7 +387,6 @@ public class IntentHandler {
         int NEWS = 8;
         int LINE = 9;
         int WHATSAPP = 10;
@@ -66,7 +66,7 @@ index e377314a4f35d..a81b916aaf06b 100644
         int WEBAPK = 12;
         int YAHOO_MAIL = 13;
         int VIBER = 14;
@@ -572,8 +566,6 @@ public class IntentHandler {
@@ -573,8 +567,6 @@ public class IntentHandler {
             return ExternalAppId.LINE;
         } else if (PACKAGE_WHATSAPP.equals(packageName)) {
             return ExternalAppId.WHATSAPP;
@@ -76,7 +76,7 @@ index e377314a4f35d..a81b916aaf06b 100644
             return ExternalAppId.CHROME;
         } else if (assumeNonNull(packageName).startsWith(WEBAPK_PACKAGE_PREFIX)) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
index a3c6ac6a77fbc..3c7fe9a3f7080 100644
index cd9dfe8f45b64..479c1929d110a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -55,7 +55,6 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
@@ -87,7 +87,7 @@ index a3c6ac6a77fbc..3c7fe9a3f7080 100644
 import org.chromium.chrome.browser.lens.LensController;
 import org.chromium.chrome.browser.lens.LensEntryPoint;
 import org.chromium.chrome.browser.lens.LensIntentParams;
@@ -1399,12 +1398,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -1415,12 +1414,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                     LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE);
             return false;
         }
@@ -189,10 +189,10 @@ index fdc425a2ff1b0..a405c667be8dc 100644
 
     public static boolean isGoogleLensFeatureEnabled(boolean isIncognito) {
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
index 6c9613f35f387..3c63a87a82ec3 100644
index aa17e890fdd55..afe1739fa4af0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -1148,23 +1148,6 @@ public class RootUiCoordinator
@@ -1187,22 +1187,6 @@ public class RootUiCoordinator
                         mLayoutStateProviderOneShotSupplier,
                         mFullscreenManager);
         mReadAloudControllerSupplier.set(controller);
@@ -208,20 +208,19 @@ index 6c9613f35f387..3c63a87a82ec3 100644
-                        controller.maybeShowPlayer();
-                    }
-                };
-            ContextualSearchManager contextualSearchManager =
-                    mContextualSearchManagerSupplier.get();
-        ContextualSearchManager contextualSearchManager = mContextualSearchManagerSupplier.get();
-        if (contextualSearchManager != null) {
-            contextualSearchManager.addObserver(mReadAloudContextualSearchObserver);
-        }
         }
         if (DomDistillerFeatures.sReaderModeDistillInApp.isEnabled()) {
             mReaderModeBottomSheetManager =
                     new ReaderModeBottomSheetManager(
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index 6d96e8c7753c7..f97f61995effa 100644
index adb92ea3b6298..4a23025a256f0 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -678,7 +678,7 @@ BASE_FEATURE(kEnableEscapeHandlingForSecondaryActivities, base::FEATURE_DISABLED
 BASE_FEATURE(kEnableSwipeToSwitchPane, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -696,7 +696,7 @@ BASE_FEATURE(kEnableSwipeToSwitchPane, base::FEATURE_DISABLED_BY_DEFAULT);
 BASE_FEATURE(kEnableToolbarPositioningInResizeMode, base::FEATURE_ENABLED_BY_DEFAULT);
 BASE_FEATURE(kEnableXAxisActivityTransition, base::FEATURE_DISABLED_BY_DEFAULT);
 BASE_FEATURE(kEscCancelDrag, base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kExperimentsForAgsa, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -230,5 +229,5 @@ index 6d96e8c7753c7..f97f61995effa 100644
 BASE_FEATURE(kFullscreenInsetsApiMigration, base::FEATURE_DISABLED_BY_DEFAULT);
 BASE_FEATURE(kFullscreenInsetsApiMigrationOnAutomotive, base::FEATURE_ENABLED_BY_DEFAULT);
-- 
2.52.0
2.53.0