[AUTO] Patches auto-rebase for master branch (#2287)
[AUTO] Patches auto-rebase for master branch
This commit is contained in:
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -194,6 +194,11 @@ source_set("shell_integration") {
|
||||
@@ -191,6 +191,11 @@ source_set("shell_integration") {
|
||||
# require many files from it. This makes linking more efficient.
|
||||
static_library("browser") {
|
||||
sources = [
|
||||
@@ -434,7 +434,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s
|
||||
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -689,6 +689,7 @@ mojom("mojo_bindings") {
|
||||
@@ -686,6 +686,7 @@ mojom("mojo_bindings") {
|
||||
sources = [
|
||||
"chrome_render_frame.mojom",
|
||||
"google_accounts_private_api_extension.mojom",
|
||||
@@ -851,7 +851,7 @@ diff --git a/content/browser/log_console_message.h b/content/browser/log_console
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -319,6 +319,8 @@
|
||||
@@ -315,6 +315,8 @@
|
||||
#include "url/origin.h"
|
||||
#include "url/url_constants.h"
|
||||
|
||||
@@ -860,7 +860,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
#include "content/browser/accessibility/browser_accessibility_manager_android.h"
|
||||
#include "content/browser/android/content_url_loader_factory.h"
|
||||
@@ -4726,7 +4728,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
@@ -4716,7 +4718,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,
|
||||
updated_source_id,
|
||||
untrusted_stack_trace)) {
|
||||
@@ -870,7 +870,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
}
|
||||
|
||||
// Pass through log severity only on builtin components pages to limit console
|
||||
@@ -4743,8 +4746,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
@@ -4733,8 +4736,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
const bool is_off_the_record =
|
||||
GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
|
||||
|
||||
|
||||
@@ -973,7 +973,7 @@ diff --git a/content/browser/renderer_host/input/touch_selection_controller_clie
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -9224,7 +9224,7 @@ void RenderFrameHostImpl::ShowPopupMenu(
|
||||
@@ -9204,7 +9204,7 @@ void RenderFrameHostImpl::ShowPopupMenu(
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -5081,7 +5081,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
|
||||
@@ -5090,7 +5090,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
|
||||
}
|
||||
|
||||
void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
|
||||
|
||||
@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
|
||||
--- a/content/public/common/content_features.cc
|
||||
+++ b/content/public/common/content_features.cc
|
||||
@@ -1231,6 +1231,7 @@ BASE_FEATURE(kUnrestrictedSharedArrayBuffer,
|
||||
@@ -1235,6 +1235,7 @@ BASE_FEATURE(kUnrestrictedSharedArrayBuffer,
|
||||
BASE_FEATURE(kUseContextSnapshot,
|
||||
"UseContextSnapshot",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
@@ -207,7 +207,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
|
||||
@@ -3380,6 +3380,10 @@ static_library("browser") {
|
||||
@@ -3385,6 +3385,10 @@ static_library("browser") {
|
||||
"touch_to_fill/password_manager/touch_to_fill_controller_webauthn_delegate.h",
|
||||
]
|
||||
|
||||
|
||||
@@ -50276,7 +50276,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
|
||||
#include "content/browser/renderer_host/render_frame_host_impl.h"
|
||||
|
||||
@@ -3565,6 +3569,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
@@ -3567,6 +3571,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
std::move(callback));
|
||||
}
|
||||
|
||||
|
||||
@@ -135,7 +135,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
|
||||
import("//base/allocator/allocator.gni")
|
||||
import("//build/buildflag_header.gni")
|
||||
@@ -202,6 +205,8 @@ static_library("browser") {
|
||||
@@ -207,6 +210,8 @@ static_library("browser") {
|
||||
"accessibility/page_colors_factory.h",
|
||||
"accessibility/prefers_default_scrollbar_styles_prefs.cc",
|
||||
"accessibility/prefers_default_scrollbar_styles_prefs.h",
|
||||
@@ -144,7 +144,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"after_startup_task_utils.cc",
|
||||
"after_startup_task_utils.h",
|
||||
"app_mode/app_mode_utils.cc",
|
||||
@@ -2120,6 +2125,7 @@ static_library("browser") {
|
||||
@@ -2125,6 +2130,7 @@ static_library("browser") {
|
||||
"//chrome/common/notifications",
|
||||
"//chrome/installer/util:with_no_strings",
|
||||
"//chrome/services/speech/buildflags",
|
||||
@@ -152,7 +152,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"//components/application_locale_storage",
|
||||
"//components/assist_ranker",
|
||||
"//components/autofill/content/browser",
|
||||
@@ -3374,6 +3380,7 @@ static_library("browser") {
|
||||
@@ -3379,6 +3385,7 @@ static_library("browser") {
|
||||
"touch_to_fill/password_manager/touch_to_fill_controller_webauthn_delegate.h",
|
||||
]
|
||||
|
||||
@@ -160,7 +160,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
deps += [
|
||||
":delta_file_proto",
|
||||
":profile_token",
|
||||
@@ -8583,6 +8590,7 @@ static_library("browser_public_dependencies") {
|
||||
@@ -8588,6 +8595,7 @@ static_library("browser_public_dependencies") {
|
||||
"//chrome/services/file_util/public/mojom",
|
||||
"//components/account_id",
|
||||
"//components/autofill/content/browser",
|
||||
|
||||
Reference in New Issue
Block a user