Skip to content

Commit

Permalink
AUTOMATED - git apply results
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo authored Dec 1, 2023
1 parent b441c2a commit 53bc5ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This feature can be used for fingerprinting as it exposes a user preference
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3076,8 +3076,8 @@
@@ -3075,8 +3075,8 @@
base_feature: "none",
},
{
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Add-lifetime-options-for-permissions.patch
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
+ }
+
+ return pm;
}
+ }
+
+ private static boolean contains(final int[] array, final int key) {
+ int length = array.length;
Expand All @@ -967,7 +967,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
+ return true;
+ }
+ return false;
+ }
}
}
diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
--- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Restore-Search-Ready-Omnibox-flag.patch
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
mHeaderProcessor = new HeaderProcessor(context);
- registerSuggestionProcessor(
+ mEditUrlSuggestionProcessor =
+ mEditUrlSuggestionProcessor =
new EditUrlSuggestionProcessor(
- context, host, mImageSupplier, mActivityTabSupplier, shareSupplier));
+ context, host, mImageSupplier, mActivityTabSupplier, shareSupplier);
Expand Down

0 comments on commit 53bc5ef

Please sign in to comment.