AUTOMATED - git apply results
This commit is contained in:
@@ -1108,7 +1108,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//components/autofill/android:autofill_java",
|
||||
"//components/autofill/android:prefeditor_autofill_java",
|
||||
"//components/autofill_assistant/android:public_dependencies_java",
|
||||
@@ -4189,6 +4196,7 @@ group("jni_headers") {
|
||||
@@ -4193,6 +4200,7 @@ group("jni_headers") {
|
||||
"//chrome/browser/ui/messages/android:jni_headers",
|
||||
"//chrome/browser/util:jni_headers",
|
||||
"//chrome/browser/webauthn/android:jni_headers",
|
||||
|
||||
@@ -139,7 +139,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont
|
||||
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
||||
--- a/cc/trees/layer_tree_host_impl.cc
|
||||
+++ b/cc/trees/layer_tree_host_impl.cc
|
||||
@@ -4301,6 +4301,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
|
||||
@@ -4306,6 +4306,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
|
||||
if (scroll_delta.IsZero())
|
||||
return false;
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//components/dom_distiller/core:distiller_type_java",
|
||||
"//components/ntp_tiles:ntp_tiles_enums_java",
|
||||
"//components/offline_pages/core:offline_page_model_enums_java",
|
||||
@@ -4014,16 +4013,12 @@ generate_jni("chrome_jni_headers") {
|
||||
@@ -4018,16 +4017,12 @@ generate_jni("chrome_jni_headers") {
|
||||
"java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java",
|
||||
|
||||
@@ -124,7 +124,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
if (enable_printing) {
|
||||
deps += [ "//printing:printing_java" ]
|
||||
}
|
||||
@@ -4189,8 +4164,6 @@ group("jni_headers") {
|
||||
@@ -4193,8 +4168,6 @@ group("jni_headers") {
|
||||
"//chrome/browser/android/browserservices/verification:jni_headers",
|
||||
"//chrome/browser/battery/android:jni_headers",
|
||||
"//chrome/browser/commerce/merchant_viewer/android:jni_headers",
|
||||
|
||||
@@ -234,7 +234,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//chrome/browser/tab:java",
|
||||
"//components/offline_items_collection/core:core_java",
|
||||
"//components/sync/protocol:protocol_java",
|
||||
@@ -3183,13 +3165,11 @@ if (current_toolchain == default_toolchain) {
|
||||
@@ -3187,13 +3169,11 @@ if (current_toolchain == default_toolchain) {
|
||||
"//chrome/browser/optimization_guide/android:unit_device_javatests",
|
||||
"//chrome/browser/partnercustomizations:unit_device_javatests",
|
||||
"//chrome/browser/password_edit_dialog/android:unit_device_javatests",
|
||||
@@ -248,7 +248,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//chrome/browser/ui/messages/android:unit_device_javatests",
|
||||
"//chrome/browser/user_education:unit_device_javatests",
|
||||
"//chrome/browser/video_tutorials/internal:unit_device_javatests",
|
||||
@@ -4169,7 +4149,6 @@ generate_jni("chrome_jni_headers") {
|
||||
@@ -4173,7 +4153,6 @@ generate_jni("chrome_jni_headers") {
|
||||
"java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/signin/SigninBridge.java",
|
||||
|
||||
Reference in New Issue
Block a user