PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #677 from uazo/create-pull-request/patch-3b9a50e

Browse Source 
Git apply result for master branch
This commit is contained in:
uazo
2024-01-08 20:47:17 +05:00
committed by GitHub
parent 3b9a50ebea 18664c67b7
commit 1a8486dc70
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00Enable-search-engine-settings-desktop-ui.patch
+1 -1
View File
@@ -1259,7 +1259,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.h b/chrome/
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -2493,6 +2493,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
@@ -2498,6 +2498,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
{"searchEnginesQueryURL", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL},
{"searchEnginesQueryURLExplanation",
IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION},
build/patches/Allow-building-without-supervised-users.patch
+1 -1
View File
@@ -90,7 +90,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -1014,9 +1014,11 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
@@ -1018,9 +1018,11 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
build/patches/Content-settings-infrastructure.patch
+2 -2
View File
@@ -138,7 +138,7 @@ diff --git a/chrome/browser/installable/installed_webapp_bridge.cc b/chrome/brow
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -1357,4 +1357,5 @@
@@ -1366,4 +1366,5 @@
</settings-subpage>
</template>
</template>
@@ -458,7 +458,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
#include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
#include "components/password_manager/core/browser/manage_passwords_referrer.h"
#include "components/password_manager/core/common/password_manager_features.h"
@@ -3678,6 +3681,42 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -3683,6 +3686,42 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);
build/patches/eyeo-beta-118.0.5993.48-extension_api.patch
+1 -1
View File
@@ -3501,7 +3501,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro
#include "components/autofill/core/common/autofill_prefs.h"
#include "components/bookmarks/common/bookmark_pref_names.h"
#include "components/browsing_data/core/pref_names.h"
@@ -173,6 +178,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
@@ -174,6 +179,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
return *s_allowlist;
s_allowlist = new PrefsUtil::TypedPrefMap();