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

Unverified Commit b679afd3 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Rebase to 143.0.7499.110

parent c65ef30a

build/patches/Add-a-flag-to-disable-GamePad-API.patch

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -8954,9 +8954,9 @@

@@ -8969,9 +8969,9 @@

     "expiry_milestone": 150

   },

   {

build/patches/Add-an-always-incognito-mode.patch

+3 −3
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

@@ -27,6 +27,7 @@ import org.chromium.build.annotations.Contract;

@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier;

 import org.chromium.build.annotations.NullMarked;

 import org.chromium.build.annotations.Nullable;

 import org.chromium.chrome.R;
@@ -1006,7 +1006,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 
 import org.chromium.chrome.browser.ActivityTabProvider;

 import org.chromium.chrome.browser.ai.AiAssistantService;

 import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;

@@ -242,7 +243,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

@@ -241,7 +242,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

 

         // When the feature is enabled, show either "New Incognito tab" in incognito mode

         // or "New tab" in normal mode. When the feature is disabled, show both.
@@ -1986,7 +1986,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow 
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -6906,6 +6906,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

@@ -6900,6 +6900,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

       <message name="IDS_QUICK_DELETE_DIALOG_COOKIES_CACHE_AND_OTHER_SITE_DATA_TEXT" desc="Text indicating that browsing data like cookies, cache, and other site data would be deleted.">

         Cookies, cache, and other site data

       </message>

build/patches/Add-cromite-flags-support.patch

+3 −3
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 namespace about_flags {

 

 namespace {

@@ -5176,6 +5180,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {

@@ -5183,6 +5187,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {

 };

 #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -677,7 +677,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 // RECORDING USER METRICS FOR FLAGS:

 // -----------------------------------------------------------------------------

 // The first line of the entry is the internal name.

@@ -5202,6 +5210,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {

@@ -5209,6 +5217,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {

 const FeatureEntry kFeatureEntries[] = {

 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and

 // //tools/flags/generate_unexpire_flags.py.
@@ -1011,7 +1011,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc 
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc

--- a/chrome/common/chrome_features.cc

+++ b/chrome/common/chrome_features.cc

@@ -1909,5 +1909,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

@@ -1913,5 +1913,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

 // happen silently without prompting an updating dialog.

 BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,

              base::FEATURE_DISABLED_BY_DEFAULT);

build/patches/Add-exit-menu-item.patch

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

@@ -418,6 +418,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

@@ -412,6 +412,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

             maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id);

             modelList.add(buildContentFilterHelpCenterMenuItem(currentTab));

         }

build/patches/Add-menu-item-to-bookmark-all-tabs.patch

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 
         } else if (id == R.id.close_all_incognito_tabs_menu_id) {

             boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);

 

@@ -4019,6 +4027,41 @@ public class ChromeTabbedActivity extends ChromeActivity {

@@ -4013,6 +4021,41 @@ public class ChromeTabbedActivity extends ChromeActivity {

         getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);

     }
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

@@ -294,6 +294,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

@@ -288,6 +288,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

         // Bookmarks

         modelList.add(buildBookmarksItem());
@@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 
         // Recent Tabs

         if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem());

 

@@ -474,6 +482,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

@@ -468,6 +476,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

         }

         modelList.add(buildCloseAllTabsItem());

         if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem());