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

Unverified Commit 2ba21150 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Rebase to 144.0.7559.97

parent e5fa7d55
Loading
Loading
Loading
Loading
+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
@@ -9186,9 +9186,9 @@
@@ -9195,9 +9195,9 @@
     "expiry_milestone": 150
   },
   {
+3 −3
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 namespace about_flags {
 
 namespace {
@@ -5242,6 +5246,10 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
@@ -5291,6 +5295,10 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
 };
 #endif  // !BUILDFLAG(IS_ANDROID)
 
@@ -675,7 +675,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.
@@ -5268,6 +5276,9 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
@@ -5317,6 +5325,9 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
 const FeatureEntry kFeatureEntries[] = {
 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
 // //tools/flags/generate_unexpire_flags.py.
@@ -1010,7 +1010,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
@@ -1901,5 +1901,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1906,5 +1906,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
 // happen silently without prompting an updating dialog.
 BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
              base::FEATURE_DISABLED_BY_DEFAULT);
+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ diff --git a/components/search_engines/android/java/src/org/chromium/components/
diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
--- a/components/search_engines/android/template_url_service_android.cc
+++ b/components/search_engines/android/template_url_service_android.cc
@@ -400,6 +400,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
@@ -404,6 +404,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
         jimage_translate_source_language_param_key,
     const base::android::JavaParamRef<jstring>&
         jimage_translate_target_language_param_key) {
+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -8010,6 +8010,13 @@ static_library("browser") {
@@ -8012,6 +8012,13 @@ static_library("browser") {
     ]
   }
 
+2 −2
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
--- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
@@ -765,7 +765,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
@@ -770,7 +770,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
           .SetTimeout(timeout)
           .SetUrl(fetch_url)
           .SetUploadProgressCallback(std::move(upload_progress_callback))
@@ -1728,7 +1728,7 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c
diff --git a/components/contextual_search/internal/composebox_query_controller.cc b/components/contextual_search/internal/composebox_query_controller.cc
--- a/components/contextual_search/internal/composebox_query_controller.cc
+++ b/components/contextual_search/internal/composebox_query_controller.cc
@@ -772,7 +772,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
@@ -777,7 +777,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
           .SetTimeout(timeout)
           .SetUploadProgressCallback(std::move(upload_progress_callback))
           .SetUrl(fetch_url)
Loading