0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2192 from uazo/fix-signin-and-sync-integrations-v103

Browse source 
Fix open password setting and recents tab crash
This commit is contained in:
Carl 2022-07-13 22:27:18 +02:00 • committed by GitHub
commit ae91ca61c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
build/patches/Remove-signin-and-sync-integrations.patch
View file

@ -54,7 +54,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../identity_disc/IdentityDiscController.java | 104 +--------
.../init/ChromeBrowserInitializer.java | 2 -
.../init/ProcessInitializationHandler.java | 9 -
.../chrome/browser/ntp/RecentTabsManager.java | 106 +--------
.../chrome/browser/ntp/RecentTabsManager.java | 111 +---------
.../browser/ntp/RecentTabsRowAdapter.java | 30 +--
.../browser/ntp/search/SearchBoxMediator.java | 1 -
.../browser/omaha/RequestGenerator.java | 3 -
@ -78,7 +78,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../browser/firstrun/MobileFreProgress.java | 4 +-
.../router/discovery/access_code/BUILD.gn | 1 -
.../browser/password_manager/android/BUILD.gn | 4 -
.../PasswordManagerHelper.java | 97 +-------
.../PasswordManagerHelper.java | 93 +-------
...swordSyncControllerDelegateBridgeImpl.java | 7 -
chrome/browser/privacy/BUILD.gn | 2 -
.../res/layout/privacy_review_msbb_step.xml | 8 -
@ -110,7 +110,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../ProfileOAuth2TokenServiceDelegate.java | 52 -----
.../net/HttpNegotiateAuthenticator.java | 88 +-------
.../chromoting/base/OAuthTokenFetcher.java | 2 -
91 files changed, 88 insertions(+), 2290 deletions(-)
91 files changed, 88 insertions(+), 2291 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
@ -2249,7 +2249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
@@ -15,20 +15,11 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager;
@@ -15,21 +15,11 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager;
import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
import org.chromium.chrome.browser.profiles.Profile;
@ -2267,10 +2267,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
-import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
-import org.chromium.chrome.browser.ui.signin.SigninPromoController;
-import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
import org.chromium.components.signin.AccountManagerFacadeProvider;
-import org.chromium.components.signin.AccountManagerFacadeProvider;
import org.chromium.components.signin.AccountsChangeObserver;
import org.chromium.components.signin.identitymanager.ConsentLevel;
@@ -42,8 +33,7 @@ import java.util.Map;
import org.chromium.components.signin.metrics.SigninAccessPoint;
@@ -42,8 +32,7 @@ import java.util.Map;
/**
* Provides the domain logic and data for RecentTabsPage and RecentTabsRowAdapter.
*/
@ -2280,7 +2281,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
/**
* Implement this to receive updates when the page contents change.
*/
@@ -64,21 +54,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
@@ -64,21 +53,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
private final Runnable mShowHistoryManager;
private TabModel mTabModel;
@ -2302,7 +2303,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
/**
* Maps Session IDs to whether that entry was restored split by entry type. These are used to
* record historgrams on {@link #destroy()} to measure restore ratio. Cached Session IDs are
@@ -109,12 +93,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
@@ -109,12 +92,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null
? sRecentlyClosedTabManagerForTests
: new RecentlyClosedBridge(profile, tabModelSelector);
@ -2315,19 +2316,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
mRecentlyClosedTabManager.setEntriesUpdatedRunnable(this::updateRecentlyClosedEntries);
updateRecentlyClosedEntries();
@@ -123,11 +101,7 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
@@ -123,12 +100,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
updateForeignSessions();
mForeignSessionHelper.triggerSessionSync();
- mSyncService.addSyncStateChangedListener(this);
- mSignInManager.addSignInStateObserver(this);
- mProfileDataCache.addObserver(this);
AccountManagerFacadeProvider.getInstance().addObserver(this);
- AccountManagerFacadeProvider.getInstance().addObserver(this);
- updatePromoState();
-
SessionsInvalidationManager.get(mProfile).onRecentTabsPageOpened();
}
@@ -166,12 +140,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
@@ -166,14 +137,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
recordEntries("Group", mGroupSessionIdsRestored);
recordEntries("Bulk", mBulkSessionIdsRestored);
@ -2337,10 +2339,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
- mSignInManager = null;
-
- mProfileDataCache.removeObserver(this);
AccountManagerFacadeProvider.getInstance().removeObserver(this);
- AccountManagerFacadeProvider.getInstance().removeObserver(this);
-
mFaviconHelper.destroy();
@@ -406,7 +374,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
mFaviconHelper = null;
@@ -406,7 +369,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
*/
public void setPromoCollapsed(boolean isCollapsed) {
if (mIsDestroyed) return;
@ -2348,7 +2352,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
}
/**
@@ -415,63 +382,7 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
@@ -415,63 +377,7 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
* @return Whether the promo is collapsed.
*/
public boolean isPromoCollapsed() {
@ -2413,7 +2417,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
}
// AccountsChangeObserver implementation.
@@ -480,18 +391,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
@@ -480,18 +386,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
update();
}
@ -2432,7 +2436,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
private void onUpdateDone() {
if (mUpdatedCallback != null) {
mUpdatedCallback.onUpdated();
@@ -499,7 +398,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
@@ -499,7 +393,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
}
private void update() {
@ -3373,7 +3377,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
import org.chromium.components.browser_ui.settings.SettingsLauncher;
import org.chromium.components.prefs.PrefService;
import org.chromium.components.signin.base.CoreAccountInfo;
@@ -133,50 +132,19 @@ public class PasswordManagerHelper {
@@ -133,19 +132,7 @@ public class PasswordManagerHelper {
*/
public static void showPasswordSettings(Context context, @ManagePasswordsReferrer int referrer,
SettingsLauncher settingsLauncher, CredentialManagerLauncher credentialManagerLauncher,
@ -3390,13 +3394,10 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
- return;
- }
-
- Bundle fragmentArgs = new Bundle();
- fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer);
- context.startActivity(settingsLauncher.createSettingsActivityIntent(
- context, PASSWORD_SETTINGS_CLASS, fragmentArgs));
}
// TODO(crbug.com/1327294): Make sure we rely on the same util in all places that need
Bundle fragmentArgs = new Bundle();
fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer);
context.startActivity(settingsLauncher.createSettingsActivityIntent(
@@ -156,27 +143,12 @@ public class PasswordManagerHelper {
// to check whether UPM can be used (for password check as well as for all other cases that
// share the same preconditions, e.g. launching the credential manager).
public static boolean canUseUpmCheckup() {
@ -3426,7 +3427,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
}
/**
@@ -227,49 +195,6 @@ public class PasswordManagerHelper {
@@ -227,49 +199,6 @@ public class PasswordManagerHelper {
});
}
@ -3476,7 +3477,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
public static boolean usesUnifiedPasswordManagerUI() {
if (!ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_ANDROID)) return false;
@UpmExperimentVariation
@@ -290,24 +215,8 @@ public class PasswordManagerHelper {
@@ -290,24 +219,8 @@ public class PasswordManagerHelper {
@VisibleForTesting
static void launchTheCredentialManager(@ManagePasswordsReferrer int referrer,