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

Commit cf1d9c00 authored by uazo's avatar uazo Committed by github-actions[bot]
Browse files

[AUTO] Patches auto-rebase

parent ad41529d

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

+2 −2
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -1554,5 +1554,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,

@@ -1558,5 +1558,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,

              "WebOtpCrossDeviceSimpleString",

              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -757,7 +757,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

--- a/chrome/browser/flags/android/chrome_feature_list.h

+++ b/chrome/browser/flags/android/chrome_feature_list.h

@@ -345,6 +345,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(

@@ -346,6 +346,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(

     "snippet_as_subtitle",

     /*default_value=*/false);

build/patches/Add-custom-tab-intents-privacy-option.patch

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -1149,7 +1149,7 @@ BASE_FEATURE(kMagicStackAndroid,

@@ -1153,7 +1153,7 @@ BASE_FEATURE(kMagicStackAndroid,

 // Enables an experimental feature which forces mayLaunchUrl to use a different

 // storage partition. This may reduce performance. This should not be enabled by

 // default.

build/patches/Disable-all-predictors-code.patch

+1 −1
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ diff --git a/services/on_device_model/ml/BUILD.gn b/services/on_device_model/ml/ 
+    if (build_with_tflite_lib && !is_fuchsia) {

       deps += [ "//services/on_device_model/safety:bert_safety_model" ]

     }

     public_deps = [

     if (is_win || is_mac || is_linux) {

diff --git a/services/on_device_model/ml/ts_model.cc b/services/on_device_model/ml/ts_model.cc

--- a/services/on_device_model/ml/ts_model.cc

+++ b/services/on_device_model/ml/ts_model.cc

build/patches/Enable-search-engine-settings-desktop-ui.patch

+6 −6
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.h b/ 
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc

--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc

+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc

@@ -30,13 +30,14 @@ KeywordEditorController::~KeywordEditorController() = default;

@@ -29,13 +29,14 @@ KeywordEditorController::~KeywordEditorController() = default;

 

 int KeywordEditorController::AddTemplateURL(const std::u16string& title,

                                             const std::u16string& keyword,
@@ -1050,7 +1050,7 @@ diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chr 
 

   return new_index;

 }

@@ -44,7 +45,8 @@ int KeywordEditorController::AddTemplateURL(const std::u16string& title,

@@ -43,7 +44,8 @@ int KeywordEditorController::AddTemplateURL(const std::u16string& title,

 void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,

                                                 const std::u16string& title,

                                                 const std::u16string& keyword,
@@ -1060,7 +1060,7 @@ diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chr 
   DCHECK(!url.empty());

   const std::optional<size_t> index =

       table_model_->IndexOfTemplateURL(template_url);

@@ -56,11 +58,12 @@ void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,

@@ -55,11 +57,12 @@ void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,

 

   // Don't do anything if the entry didn't change.

   if ((template_url->short_name() == title) &&
@@ -1100,7 +1100,7 @@ diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.h b/chro 
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc

--- a/chrome/browser/ui/search_engines/template_url_table_model.cc

+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc

@@ -212,7 +212,8 @@ void TemplateURLTableModel::Remove(size_t index) {

@@ -211,7 +211,8 @@ void TemplateURLTableModel::Remove(size_t index) {

 void TemplateURLTableModel::Add(size_t index,

                                 const std::u16string& short_name,

                                 const std::u16string& keyword,
@@ -1110,7 +1110,7 @@ diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chro 
   DCHECK(index <= RowCount());

   DCHECK(!url.empty());

   TemplateURLData data;

@@ -220,13 +221,15 @@ void TemplateURLTableModel::Add(size_t index,

@@ -219,13 +220,15 @@ void TemplateURLTableModel::Add(size_t index,

   data.SetKeyword(keyword);

   data.SetURL(url);

   data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -1127,7 +1127,7 @@ diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chro 
   DCHECK(index <= RowCount());

   DCHECK(!url.empty());

   TemplateURL* template_url = GetTemplateURL(index);

@@ -235,7 +238,7 @@ void TemplateURLTableModel::ModifyTemplateURL(size_t index,

@@ -234,7 +237,7 @@ void TemplateURLTableModel::ModifyTemplateURL(size_t index,

   DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||

          template_url->SupportsReplacement(

              template_url_service_->search_terms_data()));

build/patches/Fix-chromium-build-bugs.patch

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ diff --git a/components/omnibox/browser/autocomplete_classifier.cc b/components/ 
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc

--- a/components/omnibox/browser/omnibox_field_trial.cc

+++ b/components/omnibox/browser/omnibox_field_trial.cc

@@ -896,11 +896,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default;

@@ -860,11 +860,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default;

 

 ScopedMLConfigForTesting::ScopedMLConfigForTesting()

     : original_config_(std::make_unique<MLConfig>(GetMLConfig())) {