AUTOMATED - git apply results
This commit is contained in:
@@ -25,7 +25,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr
|
||||
diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/components/privacy_sandbox/tracking_protection_prefs.cc
|
||||
--- a/components/privacy_sandbox/tracking_protection_prefs.cc
|
||||
+++ b/components/privacy_sandbox/tracking_protection_prefs.cc
|
||||
@@ -47,13 +47,13 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
|
||||
@@ -58,13 +58,13 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
|
||||
|
||||
// Tracking Protection Settings Prefs
|
||||
registry->RegisterBooleanPref(
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
|
||||
diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
|
||||
--- a/third_party/blink/renderer/modules/webgpu/gpu.cc
|
||||
+++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
|
||||
@@ -357,6 +357,7 @@ ScriptPromise GPU::requestAdapter(ScriptState* script_state,
|
||||
@@ -370,6 +370,7 @@ ScriptPromise GPU::requestAdapter(ScriptState* script_state,
|
||||
"WebGPU is experimental on this platform. See "
|
||||
"https://github.com/gpuweb/gpuweb/wiki/"
|
||||
"Implementation-Status#implementation-status"));
|
||||
|
||||
@@ -404,7 +404,7 @@ new file mode 100644
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3736,6 +3736,9 @@ static_library("browser") {
|
||||
@@ -3695,6 +3695,9 @@ static_library("browser") {
|
||||
"//components/user_scripts/android",
|
||||
]
|
||||
}
|
||||
@@ -417,7 +417,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn
|
||||
--- a/chrome/browser/resources/BUILD.gn
|
||||
+++ b/chrome/browser/resources/BUILD.gn
|
||||
@@ -22,6 +22,12 @@ assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome")
|
||||
@@ -19,6 +19,12 @@ assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome")
|
||||
group("resources") {
|
||||
public_deps = [ "segmentation_internals:resources" ]
|
||||
|
||||
@@ -445,7 +445,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc
|
||||
diff --git a/chrome/browser/resources/settings/page_visibility.ts b/chrome/browser/resources/settings/page_visibility.ts
|
||||
--- a/chrome/browser/resources/settings/page_visibility.ts
|
||||
+++ b/chrome/browser/resources/settings/page_visibility.ts
|
||||
@@ -47,7 +47,35 @@ export interface PrivacyPageVisibility {
|
||||
@@ -46,7 +46,35 @@ export interface PrivacyPageVisibility {
|
||||
*/
|
||||
export let pageVisibility: PageVisibility;
|
||||
|
||||
@@ -782,7 +782,7 @@ diff --git a/chrome/browser/search_engines/android/java/src/org/chromium/chrome/
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -1019,6 +1019,18 @@ static_library("ui") {
|
||||
@@ -1009,6 +1009,18 @@ static_library("ui") {
|
||||
"//ui/android",
|
||||
"//url",
|
||||
]
|
||||
@@ -984,7 +984,7 @@ diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrom
|
||||
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
@@ -138,6 +138,8 @@
|
||||
@@ -133,6 +133,8 @@
|
||||
#include "chrome/browser/ui/webui/webapks/webapks_ui.h"
|
||||
#include "components/feed/buildflags.h"
|
||||
#include "components/feed/feed_feature_list.h"
|
||||
@@ -993,7 +993,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
|
||||
#else // BUILDFLAG(IS_ANDROID)
|
||||
#include "chrome/browser/media/router/discovery/access_code/access_code_cast_feature.h"
|
||||
#include "chrome/browser/media/router/media_router_feature.h"
|
||||
@@ -673,6 +675,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
||||
@@ -664,6 +666,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
||||
return &NewWebUI<WebAppInternalsUI>;
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -83,7 +83,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
|
||||
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -2587,8 +2587,26 @@ void Element::StripScriptingAttributes(
|
||||
@@ -2583,8 +2583,26 @@ void Element::StripScriptingAttributes(
|
||||
attribute_vector.Shrink(destination);
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ diff --git a/chrome/browser/sharing_hub/sharing_hub_features.cc b/chrome/browser
|
||||
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
|
||||
--- a/chrome/browser/ui/browser_command_controller.cc
|
||||
+++ b/chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -1728,10 +1728,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() {
|
||||
@@ -1730,10 +1730,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() {
|
||||
command_updater_.UpdateCommandEnabled(IDC_CHROME_WHATS_NEW, show_main_ui);
|
||||
#endif
|
||||
command_updater_.UpdateCommandEnabled(IDC_CONTENT_CONTEXT_SHARING_SUBMENU,
|
||||
|
||||
@@ -80,7 +80,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
|
||||
diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
|
||||
--- a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
|
||||
+++ b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
|
||||
@@ -387,8 +387,6 @@ void PrivacySandboxAttestations::OnAttestationsParsed(
|
||||
@@ -389,8 +389,6 @@ void PrivacySandboxAttestations::OnAttestationsParsed(
|
||||
if (attestations_map.has_value() &&
|
||||
(!file_version_.IsValid() || file_version_.CompareTo(version) < 0)) {
|
||||
// Parsing succeeded and the attestations file has newer version.
|
||||
|
||||
@@ -7349,7 +7349,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.
|
||||
|
||||
import("//build/config/chromebox_for_meetings/buildflags.gni")
|
||||
import("//build/config/chromeos/ui_mode.gni")
|
||||
@@ -227,6 +230,7 @@ if (!is_android) {
|
||||
@@ -233,6 +236,7 @@ if (!is_android) {
|
||||
group("dev_ui_resources") {
|
||||
public_deps = [
|
||||
"accessibility:resources",
|
||||
@@ -7357,7 +7357,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.
|
||||
"bluetooth_internals:resources",
|
||||
"browsing_topics:resources",
|
||||
"components:resources",
|
||||
@@ -282,6 +286,7 @@ repack("dev_ui_paks") {
|
||||
@@ -288,6 +292,7 @@ repack("dev_ui_paks") {
|
||||
|
||||
sources = [
|
||||
"$root_gen_dir/chrome/accessibility_resources.pak",
|
||||
@@ -8036,7 +8036,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
|
||||
#include "chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/browsing_topics/browsing_topics_internals_ui.h"
|
||||
@@ -437,8 +442,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
||||
@@ -439,8 +444,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
||||
// after the host name.
|
||||
if (url.host_piece() == chrome::kChromeUIAccessibilityHost)
|
||||
return &NewWebUI<AccessibilityUI>;
|
||||
|
||||
@@ -702,7 +702,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
@@ -630,11 +630,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
|
||||
@@ -631,11 +631,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
|
||||
// chrome-untrusted://new-tab-page for other external content and resources.
|
||||
// NOTE: Use caution when overriding content security policies as that cean
|
||||
// lead to subtle security bugs such as https://crbug.com/1251541.
|
||||
|
||||
Reference in New Issue
Block a user