Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr148][Android] Cleanup MultiWindowUtils#getInstanceCountWithFallback()

Browse Source 
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/a8ce63dc2a3db3dbe93ef44747e21fae654f35ec

commit a8ce63dc2a3db3dbe93ef44747e21fae654f35ec
Author: Aishwarya Rajesh <aishwaryarj@google.com>
Date:   Thu Mar 26 13:51:59 2026 -0700

    [RWM] Cleanup MultiWindowUtils#getInstanceCountWithFallback()

    Rename the method to getInstanceCount() and use this to replace current
    callsites of getIncognitoInstanceCount() so that the latter can be
    removed.

    Bug: 461553972
    Change-Id: I0eb9cc5c48394312310bce90c2a7e1970249d816
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7700123
    Reviewed-by: Sirisha Kavuluru <skavuluru@google.com>
    Commit-Queue: Aishwarya Rajesh <aishwaryarj@google.com>
    Cr-Commit-Position: refs/heads/main@{#1605765}
This commit is contained in:
AlexeyBarabash
2026-04-27 12:00:55 +01:00
committed by Claudio DeSouza
parent 22660beed3
commit f2fb800992
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+1 -1
View File
@@ -1432,7 +1432,7 @@ public abstract class BraveActivity extends ChromeActivity
// Check multiwindow toggle for upgrade case
if (!isFirstInstall
&& !BraveMultiWindowUtils.isCheckUpgradeEnableMultiWindows()
&& MultiWindowUtils.getInstanceCountWithFallback(PersistedInstanceType.ACTIVE) > 1
&& MultiWindowUtils.getInstanceCount(PersistedInstanceType.ACTIVE) > 1
&& !BraveMultiWindowUtils.shouldEnableMultiWindows()) {
BraveMultiWindowUtils.setCheckUpgradeEnableMultiWindows(true);
BraveMultiWindowUtils.updateEnableMultiWindows(true);
android/java/org/chromium/chrome/browser/multiwindow/BraveMultiInstanceManagerApi31.java
+1 -1
View File
@@ -86,7 +86,7 @@ class BraveMultiInstanceManagerApi31 extends MultiInstanceManagerApi31 {
Collections.singletonList(getCurrentInstanceId()),
CloseWindowAppSource.NO_TABS_IN_WINDOW);
}
if (MultiWindowUtils.getInstanceCountWithFallback(PersistedInstanceType.ACTIVE) == 1) {
if (MultiWindowUtils.getInstanceCount(PersistedInstanceType.ACTIVE) == 1) {
BraveMultiWindowUtils.updateEnableMultiWindows(false);
} else {
Snackbar snackbar =
android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
+2 -3
View File
@@ -283,15 +283,14 @@ public class AppearancePreferences extends AppearanceSettingsFragment
.writeBoolean(BravePreferenceKeys.BRAVE_TAB_GROUPS_ENABLED, (boolean) newValue);
} else if (PREF_ENABLE_MULTI_WINDOWS.equals(key)) {
if (!(boolean) newValue) {
if (MultiWindowUtils.getInstanceCountWithFallback(PersistedInstanceType.ACTIVE)
> 1) {
if (MultiWindowUtils.getInstanceCount(PersistedInstanceType.ACTIVE) > 1) {
BraveMultiWindowDialogFragment dialogFragment =
BraveMultiWindowDialogFragment.newInstance();
BraveMultiWindowDialogFragment.DismissListener dismissListener =
new BraveMultiWindowDialogFragment.DismissListener() {
@Override
public void onDismiss() {
if (MultiWindowUtils.getInstanceCountWithFallback(
if (MultiWindowUtils.getInstanceCount(
PersistedInstanceType.ACTIVE)
== 1) {
if (preference instanceof ChromeSwitchPreference) {