| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferences.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferences.java
|
| index bf39562e1d6d65fa1f4bae04f4d9753402bbc95b..b22cbd760e9c6caf3875e28d93febef106b96682 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferences.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferences.java
|
| @@ -23,6 +23,8 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
| import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
|
| import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
|
| import org.chromium.chrome.browser.profiles.Profile;
|
| +import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
|
| +import org.chromium.chrome.browser.util.IntentUtils;
|
| import org.chromium.third_party.android.datausagechart.NetworkStats;
|
| import org.chromium.third_party.android.datausagechart.NetworkStatsHistory;
|
|
|
| @@ -39,6 +41,8 @@ public class DataReductionPreferences extends PreferenceFragment {
|
|
|
| private boolean mIsEnabled;
|
| private boolean mWasEnabledAtCreation;
|
| + /** Whether the current Activity is started from the snackbar promo. */
|
| + private boolean mFromPromo;
|
|
|
| @Override
|
| public void onCreate(Bundle savedInstanceState) {
|
| @@ -53,6 +57,11 @@ public class DataReductionPreferences extends PreferenceFragment {
|
| updatePreferences(isEnabled);
|
|
|
| setHasOptionsMenu(true);
|
| +
|
| + if (getActivity() != null) {
|
| + mFromPromo = IntentUtils.safeGetBooleanExtra(getActivity().getIntent(),
|
| + DataReductionPromoSnackbarController.FROM_PROMO, false);
|
| + }
|
| }
|
|
|
| @Override
|
| @@ -60,7 +69,11 @@ public class DataReductionPreferences extends PreferenceFragment {
|
| super.onDestroy();
|
|
|
| int statusChange;
|
| - if (mWasEnabledAtCreation) {
|
| + if (mFromPromo) {
|
| + statusChange = mIsEnabled
|
| + ? DataReductionProxyUma.ACTION_SNACKBAR_LINK_CLICKED
|
| + : DataReductionProxyUma.ACTION_SNACKBAR_LINK_CLICKED_DISABLED;
|
| + } else if (mWasEnabledAtCreation) {
|
| statusChange = mIsEnabled
|
| ? DataReductionProxyUma.ACTION_ON_TO_ON
|
| : DataReductionProxyUma.ACTION_ON_TO_OFF;
|
|
|