From 0d9727fe929e43f06a4eb4e552e7fba801fd5abb Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Mon, 9 Mar 2026 09:26:05 -0400
Subject: [PATCH] Revert "[cr147][Android] Unify ActivityWindowAndroid
 constructors"

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/ffa30deb10c192a3868af67b1d74613a21e1c8ad

commit ffa30deb10c192a3868af67b1d74613a21e1c8ad
Author: Sky Malice <skym@chromium.org>
Date:   Wed Mar 4 15:55:45 2026 -0800

    Revert "Unify ActivityWindowAndroid constructors."

    This reverts commit ed612a376e529ea2e029661b23d1bd5198d929c2.

    Reason for revert: Landed on top of a CL that crashed

    Original change's description:
    > Unify ActivityWindowAndroid constructors.
    >
    > Bug: 486880198
    > Change-Id: Idf72221abcb738a970030bfbba2b3499013e18d6
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7600760
    > Reviewed-by: Simeon Anfinrud <sanfin@chromium.org>
    > Reviewed-by: Ted Choc <tedchoc@chromium.org>
    > Reviewed-by: Nate Fischer <ntfschr@chromium.org>
    > Reviewed-by: Menghan Yang <myuu@google.com>
    > Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
    > Commit-Queue: Sky Malice <skym@chromium.org>
    > Cr-Commit-Position: refs/heads/main@{#1592568}

    Bug: 486880198, 488022589
    Bug: 486880198
    Change-Id: I4ceab5eecb55652e1b29871f8fa214a990e21e38
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7633525
    Reviewed-by: Brandon Wylie <wylieb@google.com>
    Commit-Queue: Sky Malice <skym@chromium.org>
    Auto-Submit: Sky Malice <skym@chromium.org>
    Owners-Override: Harry Souders <harrysouders@google.com>
    Cr-Commit-Position: refs/heads/main@{#1594298}
---
 .../app/bookmarks/BraveBookmarkActivity.java        |  2 +-
 .../activities/BraveWalletActivity.java             | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/app/bookmarks/BraveBookmarkActivity.java b/android/java/org/chromium/chrome/browser/app/bookmarks/BraveBookmarkActivity.java
index 3b18719890c..dfa99087d44 100644
--- a/android/java/org/chromium/chrome/browser/app/bookmarks/BraveBookmarkActivity.java
+++ b/android/java/org/chromium/chrome/browser/app/bookmarks/BraveBookmarkActivity.java
@@ -25,7 +25,7 @@ public class BraveBookmarkActivity extends BookmarkActivity {
 
         IntentRequestTracker intentRequestTracker = IntentRequestTracker.createFromActivity(this);
         mWindowAndroid =
-                ActivityWindowAndroid.create(
+                new ActivityWindowAndroid(
                         this, true, intentRequestTracker, null, /* trackOcclusion= */ false);
 
         if (mBookmarkManagerCoordinator instanceof BraveBookmarkManagerCoordinator) {
diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java
index 4c5062f2e5b..57f31541d45 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java
@@ -31,12 +31,8 @@ import org.chromium.chrome.browser.settings.BraveWalletPreferences;
 import org.chromium.chrome.browser.settings.SettingsNavigationFactory;
 import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
 import org.chromium.components.browser_ui.settings.SettingsNavigation;
-import org.chromium.ui.base.ActivityKeyboardVisibilityDelegate;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.modaldialog.ModalDialogManager;
-import org.chromium.ui.permissions.ActivityAndroidPermissionDelegate;
-
-import java.lang.ref.WeakReference;
 
 /** Main Brave Wallet activity */
 public class BraveWalletActivity extends BraveWalletBaseActivity implements OnNextPage {
@@ -181,14 +177,7 @@ public class BraveWalletActivity extends BraveWalletBaseActivity implements OnNe
     @Override
     protected ActivityWindowAndroid createWindowAndroid() {
         return new ActivityWindowAndroid(
-                this,
-                true,
-                new ActivityAndroidPermissionDelegate(new WeakReference<>(this)),
-                new ActivityKeyboardVisibilityDelegate(new WeakReference<>(this)),
-                /* activityTopResumedSupported= */ false,
-                getIntentRequestTracker(),
-                null,
-                /* trackOcclusion= */ false) {
+                this, true, getIntentRequestTracker(), null, /* trackOcclusion= */ false) {
             @Override
             public ModalDialogManager getModalDialogManager() {
                 return mModalDialogManager;