Close site settings pages

android/brave_java_sources.gni

@@ -162,6 +162,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/shields/ShieldsTooltipEnum.java",
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
+  "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java",
@@ -241,7 +242,10 @@ if (enable_brave_sync) {
   ]
 }
 
-brave_components_browser_ui_site_settings_android_java = [ "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java" ]
+brave_components_browser_ui_site_settings_android_java = [ 
+  "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java",
+  "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java",
+]
 
 brave_browser_ui_android_appmenu_internal_sources = [ "//brave/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java" ]
 

android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java

@@ -0,0 +1,30 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.site_settings;
+
+import android.content.Context;
+import android.content.Intent;
+
+import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
+import org.chromium.chrome.browser.app.BraveActivity;
+import org.chromium.chrome.browser.ChromeTabbedActivity;
+import org.chromium.components.embedder_support.browser_context.BrowserContextHandle;
+
+
+public class BraveSiteSettingsDelegate extends ChromeSiteSettingsDelegate {
+	public BraveSiteSettingsDelegate(Context context, BrowserContextHandle browserContextHandle) {
+		super(context, browserContextHandle);
+	}
+
+    @Override
+    public void closeButton() {
+        Intent intent = new Intent(BraveActivity.getChromeTabbedActivity(), ChromeTabbedActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);    
+        BraveActivity.getChromeTabbedActivity().startActivity(intent);
+    }
+
+}
+

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

@@ -134,7 +134,10 @@ public void testClassesExist() throws Exception {
         Assert.assertTrue(classExists(
                 "org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator"));
         Assert.assertTrue(classExists(
-                "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator"));
+                "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator")); 
+        Assert.assertTrue(classExists(
+                "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate"));        
+
     }
 
     @Test
@@ -268,6 +271,11 @@ public void testConstructorsExistAndMatch() throws Exception {
                 "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator",
                 ViewGroup.class, ThemeColorProvider.class, ScrimCoordinator.class,
                 ObservableSupplier.class));
+        Assert.assertTrue(
+                constructorsMatch("org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate",
+                "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate",
+                Context.class, BrowserContextHandle.class
+                ));
     }
 
     @Test

build/android/bytecode/BUILD.gn

@@ -9,6 +9,8 @@ assert(current_toolchain == default_toolchain)
 java_binary("java_bytecode_rewriter") {
   sources = [
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveActivityClassAdapter.java",
+    "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSiteSettingsDelegateAdapter.java",
+    "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSingleCategorySettingsAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAndroidSyncSettingsClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAppMenuClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkUtilsClassAdapter.java",

build/android/bytecode/bytecode_rewriter.gni

@@ -5,10 +5,12 @@ brave_bytecode_jars = [
   "obj/chrome/android/chrome_java.javac.jar",
   "obj/chrome/android/features/tab_ui/java.javac.jar",
   "obj/chrome/browser/safe_browsing/android/java.javac.jar",
-  "obj/chrome/browser/ui/android/appmenu/internal/java.javac.jar",
+  "obj/chrome/browser/site_settings/android/java.javac.jar",
   "obj/chrome/browser/ui/android/toolbar/java.javac.jar",
+  "obj/chrome/browser/ui/android/appmenu/internal/java.javac.jar",
   "obj/components/external_intents/android/java.javac.jar",
   "obj/components/sync/android/sync_java.javac.jar",
+  "obj/components/browser_ui/site_settings/android/java.javac.jar",
 ]
 
 template("brave_bytecode_rewriter") {

build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java

@@ -9,7 +9,7 @@
 
 public class BraveClassAdapter {
     public static ClassVisitor createAdapter(ClassVisitor chain) {
-        chain = new BraveActivityClassAdapter(chain);
+        chain = new BraveActivityClassAdapter(chain);   
         chain = new BraveAndroidSyncSettingsClassAdapter(chain);
         chain = new BraveAppMenuClassAdapter(chain);
         chain = new BraveBookmarkUtilsClassAdapter(chain);
@@ -38,6 +38,8 @@ public static ClassVisitor createAdapter(ClassVisitor chain) {
         chain = new BraveToolbarLayoutClassAdapter(chain);
         chain = new BraveToolbarManagerClassAdapter(chain);
         chain = new BraveTopToolbarCoordinatorClassAdapter(chain);
+        chain = new BraveSiteSettingsDelegateAdapter(chain);
+        chain = new BraveSingleCategorySettingsAdapter(chain);
         return chain;
     }
 }

build/android/bytecode/java/org/brave/bytecode/BraveSingleCategorySettingsAdapter.java

@@ -0,0 +1,19 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.brave.bytecode;
+
+import org.objectweb.asm.ClassVisitor;
+
+public class BraveSingleCategorySettingsAdapter extends BraveClassVisitor {
+    static String sSingleCategorySettingsClassName = "org/chromium/components/browser_ui/site_settings/SingleCategorySettings";
+    static String sBraveSingleCategorySettingsClassName = "org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings";
+
+    public BraveSingleCategorySettingsAdapter(ClassVisitor visitor) {
+        super(visitor);
+
+        changeSuperName(sSingleCategorySettingsClassName, sBraveSingleCategorySettingsClassName);
+    }
+}

build/android/bytecode/java/org/brave/bytecode/BraveSiteSettingsDelegateAdapter.java

@@ -0,0 +1,20 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.brave.bytecode;
+
+import org.objectweb.asm.ClassVisitor;
+
+public class BraveSiteSettingsDelegateAdapter extends BraveClassVisitor {
+
+    static String sChromeSiteSettingsDelegateClassName = "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate";
+    static String sBraveSiteSettingsDelegateClassName = "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate";
+
+    public BraveSiteSettingsDelegateAdapter(ClassVisitor visitor) {
+        super(visitor);
+
+        redirectConstructor(sChromeSiteSettingsDelegateClassName, sBraveSiteSettingsDelegateClassName);
+    }
+}

components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java

@@ -0,0 +1,27 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.components.browser_ui.site_settings;
+
+import android.os.Bundle;	
+import android.view.MenuItem;
+
+import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment;
+
+public class BraveSingleCategorySettings extends SiteSettingsPreferenceFragment {
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.close_menu_id) {
+            getSiteSettingsDelegate().closeButton();
+        }
+
+		return super.onOptionsItemSelected(item);
+    }
+
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "brave-core",
-  "version": "1.24.26",
+  "version": "1.24.27",
   "description": "Brave Core is a set of changes, APIs, and scripts used for customizing Chromium to make Brave.",
   "main": "index.js",
   "scripts": {

patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChromeSiteSettingsDelegate.java.patch

@@ -0,0 +1,10 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
+index f488483e0329069786f2660c41fd6a1aa44f9c5d..701ddbdfb8efd6bf98fa1d6ce51c90a0c8aa2b34 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
+@@ -253,4 +253,5 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+             mPrivacySandboxController.dismissSnackbar();
+         }
+     }
++    @Override public void closeButton(){}
+ }

patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsDelegate.java.patch

@@ -0,0 +1,10 @@
+diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
+index d3ee6e055a77c1a75e6eef28d7ddbe5c4213f469..1480e843aa7ec4ace919387691b3f217195c4ba4 100644
+--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
++++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
+@@ -123,4 +123,5 @@ public interface SiteSettingsDelegate {
+      * Dismisses the Privacy Sandbox snackbar, if active.
+      */
+     void dismissPrivacySandboxSnackbar();
++    void closeButton();
+ }

patches/weblayer-browser-java-org-chromium-weblayer_private-settings-WebLayerSiteSettingsDelegate.java.patch

@@ -0,0 +1,12 @@
+diff --git a/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java b/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
+index 84e9b0dc6a2bfc09b415eb518cf237c513dc93c6..a89fcbcffbe694ad98009f937eea297f96428230 100644
+--- a/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
++++ b/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
+@@ -130,6 +130,7 @@ public class WebLayerSiteSettingsDelegate
+     @Override
+     public void launchSettingsHelpAndFeedbackActivity(Activity currentActivity) {}
+
++    @Override public void closeButton() {}
+     @Override
+     public void launchProtectedContentHelpAndFeedbackActivity(Activity currentActivity) {}
+