[AUTO] Patches auto-rebase for master branch (#1411)

[AUTO] Patches auto-rebase for master branch
This commit is contained in:
uazo
2024-08-28 19:14:09 -12:00
committed by GitHub
4 changed files with 5 additions and 5 deletions
@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
#include "base/feature_list.h"
#include "base/format_macros.h"
#include "base/functional/bind.h"
@@ -530,6 +531,15 @@ AutocompleteController::AutocompleteController(
@@ -529,6 +530,15 @@ AutocompleteController::AutocompleteController(
provider_client_->GetOmniboxTriggeredFeatureService()),
steady_state_omnibox_position_(
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
@@ -440,7 +440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -15796,6 +15796,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -15805,6 +15805,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
Never show this again.
</message>
@@ -310,7 +310,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
#include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h"
#include "components/omnibox/browser/bookmark_provider.h"
#include "components/omnibox/browser/bookmark_scoring_signals_annotator.h"
@@ -121,6 +123,7 @@ using ProviderType = AutocompleteProvider::Type;
@@ -120,6 +122,7 @@ using ProviderType = AutocompleteProvider::Type;
constexpr bool is_android = !!BUILDFLAG(IS_ANDROID);
@@ -318,7 +318,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
void RecordMlScoreCoverage(size_t matches_with_non_null_scores,
size_t total_scored_matches) {
int percent_score_coverage =
@@ -218,6 +221,7 @@ void RecordScoringSignalCoverageForProvider(
@@ -217,6 +220,7 @@ void RecordScoringSignalCoverageForProvider(
pair.second);
}
}
@@ -120,7 +120,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -111,6 +111,10 @@ found in the LICENSE file.
@@ -116,6 +116,10 @@ found in the LICENSE file.
android:title="@string/close_tabs_on_exit_title"
android:summary="@string/close_tabs_on_exit_summary"
android:defaultValue="false" />