Replace deprecated getLastUsedProfile function in Sync Settings.
|Profile#getLastUsedProfile| is deprecated and replaced with
|Profile#getLastUsedRegularProfile|. This CL updates
Sync Settings classes.
Since settings is considered as always running on regular mode,
it is safe to use regular profile even called in incognito mode for
initialization of HelpAndFeedback activity and checking whether profile
is child profile. Therefore, it is safe to leave behavior as-is today
and no need to make change on code behavior to act differently for each
profile.
Note: This change is only code clean-up, does not change any behavior.
Change-Id: I130ae3c5daedaf29ef412234c1d04594d1ea9093
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2072179
Reviewed-by: Boris Sazonov <[email protected]>
Reviewed-by: Ramin Halavati <[email protected]>
Commit-Queue: Side YILMAZ <[email protected]>
Cr-Commit-Position: refs/heads/master@{#745911}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
index b907615..50bff24 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
@@ -106,7 +106,7 @@
getArguments().getInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType);
}
- mProfile = Profile.getLastUsedProfile();
+ mProfile = Profile.getLastUsedRegularProfile();
SigninUtils.logEvent(ProfileAccountManagementMetrics.VIEW, mGaiaServiceType);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
index b0abb52..1e3b958 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
@@ -140,7 +140,7 @@
type.setOnPreferenceChangeListener(this);
}
- if (Profile.getLastUsedProfile().isChild()) {
+ if (Profile.getLastUsedRegularProfile().isChild()) {
mGoogleActivityControls.setSummary(
R.string.sign_in_google_activity_controls_summary_child_account);
}
@@ -168,7 +168,7 @@
if (item.getItemId() == R.id.menu_id_targeted_help) {
HelpAndFeedback.getInstance().show(getActivity(),
getString(R.string.help_context_sync_and_services),
- Profile.getLastUsedProfile(), null);
+ Profile.getLastUsedRegularProfile(), null);
return true;
}
return false;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
index caffb84..e8e0db9e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
@@ -282,7 +282,7 @@
} else if (item.getItemId() == R.id.menu_id_targeted_help) {
HelpAndFeedback.getInstance().show(getActivity(),
getString(R.string.help_context_sync_and_services),
- Profile.getLastUsedProfile(), null);
+ Profile.getLastUsedRegularProfile(), null);
return true;
}
return false;
@@ -393,7 +393,7 @@
/** Returns whether Sync can be disabled. */
private boolean canDisableSync() {
- return !Profile.getLastUsedProfile().isChild();
+ return !Profile.getLastUsedRegularProfile().isChild();
}
/** Returns whether user did not complete the sign in flow. */
