Commit 7b9a8cd1 authored by Side Yilmaz's avatar Side Yilmaz Committed by Commit Bot

Replace deprecated getLastUsedProfile function in settings.

|Profile#getLastUsedProfile| is deprecated and replaced with
|Profile#getLastUsedRegularProfile|. This CL updates
HelpAndFeedback activity initialization at 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 this reason, there is no need to make change on code behavior to
act differently for each profile. Therefore, it is safe to leave
behavior as-is today.

Note: This change is only code clean-up, does not change any behavior.

Bug: 1041781
Change-Id: Ic3bc99d747d28aa6269b7243d7f9feb7337ed75a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2058817Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742527}
parent 9e86ff68
...@@ -51,8 +51,8 @@ public class LearnMorePreference extends Preference { ...@@ -51,8 +51,8 @@ public class LearnMorePreference extends Preference {
@Override @Override
protected void onClick() { protected void onClick() {
Activity activity = ContextUtils.activityFromContext(getContext()); Activity activity = ContextUtils.activityFromContext(getContext());
HelpAndFeedback.getInstance().show( HelpAndFeedback.getInstance().show(activity, activity.getString(mHelpContext),
activity, activity.getString(mHelpContext), Profile.getLastUsedProfile(), null); Profile.getLastUsedRegularProfile(), null);
} }
@Override @Override
......
...@@ -239,7 +239,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity ...@@ -239,7 +239,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
return true; return true;
} else if (item.getItemId() == R.id.menu_id_general_help) { } else if (item.getItemId() == R.id.menu_id_general_help) {
HelpAndFeedback.getInstance().show(this, getString(R.string.help_context_settings), HelpAndFeedback.getInstance().show(this, getString(R.string.help_context_settings),
Profile.getLastUsedProfile(), null); Profile.getLastUsedRegularProfile(), null);
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
......
...@@ -175,7 +175,8 @@ public class PasswordSettings ...@@ -175,7 +175,8 @@ public class PasswordSettings
} }
if (id == R.id.menu_id_targeted_help) { if (id == R.id.menu_id_targeted_help) {
HelpAndFeedback.getInstance().show(getActivity(), HelpAndFeedback.getInstance().show(getActivity(),
getString(R.string.help_context_passwords), Profile.getLastUsedProfile(), null); getString(R.string.help_context_passwords), Profile.getLastUsedRegularProfile(),
null);
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
......
...@@ -189,7 +189,7 @@ public class ClearBrowsingDataTabsFragment extends Fragment { ...@@ -189,7 +189,7 @@ public class ClearBrowsingDataTabsFragment extends Fragment {
if (item.getItemId() == R.id.menu_id_targeted_help) { if (item.getItemId() == R.id.menu_id_targeted_help) {
HelpAndFeedback.getInstance().show(getActivity(), HelpAndFeedback.getInstance().show(getActivity(),
getString(R.string.help_context_clear_browsing_data), getString(R.string.help_context_clear_browsing_data),
Profile.getLastUsedProfile(), null); Profile.getLastUsedRegularProfile(), null);
return true; return true;
} }
return false; return false;
......
...@@ -156,7 +156,8 @@ public class PrivacySettings ...@@ -156,7 +156,8 @@ public class PrivacySettings
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.menu_id_targeted_help) { if (item.getItemId() == R.id.menu_id_targeted_help) {
HelpAndFeedback.getInstance().show(getActivity(), HelpAndFeedback.getInstance().show(getActivity(),
getString(R.string.help_context_privacy), Profile.getLastUsedProfile(), null); getString(R.string.help_context_privacy), Profile.getLastUsedRegularProfile(),
null);
return true; return true;
} }
return false; return false;
......
...@@ -131,7 +131,8 @@ public class ChosenObjectSettings extends PreferenceFragmentCompat { ...@@ -131,7 +131,8 @@ public class ChosenObjectSettings extends PreferenceFragmentCompat {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.menu_id_targeted_help) { if (item.getItemId() == R.id.menu_id_targeted_help) {
HelpAndFeedback.getInstance().show(getActivity(), HelpAndFeedback.getInstance().show(getActivity(),
getString(R.string.help_context_settings), Profile.getLastUsedProfile(), null); getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(),
null);
return true; return true;
} }
return false; return false;
......
...@@ -391,8 +391,8 @@ public class SingleCategorySettings extends PreferenceFragmentCompat ...@@ -391,8 +391,8 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
if (mCategory.showSites(SiteSettingsCategory.Type.PROTECTED_MEDIA)) { if (mCategory.showSites(SiteSettingsCategory.Type.PROTECTED_MEDIA)) {
helpContextResId = R.string.help_context_protected_content; helpContextResId = R.string.help_context_protected_content;
} }
HelpAndFeedback.getInstance().show( HelpAndFeedback.getInstance().show(getActivity(), getString(helpContextResId),
getActivity(), getString(helpContextResId), Profile.getLastUsedProfile(), null); Profile.getLastUsedRegularProfile(), null);
return true; return true;
} }
if (handleSearchNavigation(item, mSearchItem, mSearch, getActivity())) { if (handleSearchNavigation(item, mSearchItem, mSearch, getActivity())) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment