Commit 44c5b68e authored by Henrique Nakashima's avatar Henrique Nakashima Committed by Commit Bot

Move a SharedPref from HistoryManager to ChromePreferenceKeys

Register it in ChromePreferenceKeys and use SharedPreferencesManager
consistently instead of SharedPreferences directly.

Bug: 1022108
Change-Id: I1c0bea6950d1a52d4213d11d421d89ce3b87ea01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003454
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733040}
parent 2f553bdf
...@@ -32,9 +32,11 @@ import org.chromium.chrome.browser.ChromeTabbedActivity; ...@@ -32,9 +32,11 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.document.ChromeLauncherActivity;
import org.chromium.chrome.browser.favicon.LargeIconBridge; import org.chromium.chrome.browser.favicon.LargeIconBridge;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar; import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver; import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.settings.SettingsLauncher; import org.chromium.chrome.browser.settings.SettingsLauncher;
import org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataTabsFragment; import org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataTabsFragment;
...@@ -66,7 +68,6 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser ...@@ -66,7 +68,6 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
private static final int FAVICON_MAX_CACHE_SIZE_BYTES = private static final int FAVICON_MAX_CACHE_SIZE_BYTES =
10 * ConversionUtils.BYTES_PER_MEGABYTE; // 10MB 10 * ConversionUtils.BYTES_PER_MEGABYTE; // 10MB
private static final String METRICS_PREFIX = "Android.HistoryPage."; private static final String METRICS_PREFIX = "Android.HistoryPage.";
private static final String PREF_SHOW_HISTORY_INFO = "history_home_show_info";
// Keep consistent with the UMA constants on the WebUI history page (history/constants.js). // Keep consistent with the UMA constants on the WebUI history page (history/constants.js).
private static final int UMA_MAX_BUCKET_VALUE = 1000; private static final int UMA_MAX_BUCKET_VALUE = 1000;
...@@ -112,8 +113,8 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser ...@@ -112,8 +113,8 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
@SuppressWarnings("unchecked") // mSelectableListLayout @SuppressWarnings("unchecked") // mSelectableListLayout
public HistoryManager(Activity activity, boolean isSeparateActivity, public HistoryManager(Activity activity, boolean isSeparateActivity,
SnackbarManager snackbarManager, boolean isIncognito) { SnackbarManager snackbarManager, boolean isIncognito) {
mShouldShowInfoHeader = mShouldShowInfoHeader = SharedPreferencesManager.getInstance().readBoolean(
ContextUtils.getAppSharedPreferences().getBoolean(PREF_SHOW_HISTORY_INFO, true); ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO, true);
mActivity = activity; mActivity = activity;
mIsSeparateActivity = isSeparateActivity; mIsSeparateActivity = isSeparateActivity;
mSnackbarManager = snackbarManager; mSnackbarManager = snackbarManager;
...@@ -266,10 +267,8 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser ...@@ -266,10 +267,8 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
return true; return true;
} else if (item.getItemId() == R.id.info_menu_id) { } else if (item.getItemId() == R.id.info_menu_id) {
mShouldShowInfoHeader = !mShouldShowInfoHeader; mShouldShowInfoHeader = !mShouldShowInfoHeader;
ContextUtils.getAppSharedPreferences() SharedPreferencesManager.getInstance().writeBoolean(
.edit() ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO, mShouldShowInfoHeader);
.putBoolean(PREF_SHOW_HISTORY_INFO, mShouldShowInfoHeader)
.apply();
mToolbar.updateInfoMenuItem(shouldShowInfoButton(), shouldShowInfoHeaderIfAvailable()); mToolbar.updateInfoMenuItem(shouldShowInfoButton(), shouldShowInfoHeaderIfAvailable());
mHistoryAdapter.setPrivacyDisclaimer(); mHistoryAdapter.setPrivacyDisclaimer();
} }
......
...@@ -396,6 +396,8 @@ public final class ChromePreferenceKeys { ...@@ -396,6 +396,8 @@ public final class ChromePreferenceKeys {
public static final String FONT_USER_FONT_SCALE_FACTOR = "user_font_scale_factor"; public static final String FONT_USER_FONT_SCALE_FACTOR = "user_font_scale_factor";
public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom"; public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom";
public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
/** Keys used to save settings related to homepage. */ /** Keys used to save settings related to homepage. */
public static final String HOMEPAGE_CUSTOM_URI = "homepage_custom_uri"; public static final String HOMEPAGE_CUSTOM_URI = "homepage_custom_uri";
public static final String HOMEPAGE_ENABLED = "homepage"; public static final String HOMEPAGE_ENABLED = "homepage";
...@@ -760,6 +762,7 @@ public final class ChromePreferenceKeys { ...@@ -760,6 +762,7 @@ public final class ChromePreferenceKeys {
FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED, FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED,
FONT_USER_FONT_SCALE_FACTOR, FONT_USER_FONT_SCALE_FACTOR,
FONT_USER_SET_FORCE_ENABLE_ZOOM, FONT_USER_SET_FORCE_ENABLE_ZOOM,
HISTORY_SHOW_HISTORY_INFO,
HOMEPAGE_CUSTOM_URI, HOMEPAGE_CUSTOM_URI,
HOMEPAGE_ENABLED, HOMEPAGE_ENABLED,
HOMEPAGE_USE_DEFAULT_URI, HOMEPAGE_USE_DEFAULT_URI,
......
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