Chromium Code Reviews| 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..54304dc0ff7c260444c147b7a9bd20002d1efc46 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,7 @@ 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.third_party.android.datausagechart.NetworkStats; |
| import org.chromium.third_party.android.datausagechart.NetworkStatsHistory; |
| @@ -39,6 +40,8 @@ public class DataReductionPreferences extends PreferenceFragment { |
| private boolean mIsEnabled; |
| private boolean mWasEnabledAtCreation; |
| + // Whether the current activity is started from the snackbar promo. |
|
gone
2016/10/13 01:03:11
Maybe use single line javadoc syntax here so it sh
megjablon
2016/10/24 23:59:00
Done.
|
| + private boolean mFromPromo; |
| @Override |
| public void onCreate(Bundle savedInstanceState) { |
| @@ -53,12 +56,28 @@ public class DataReductionPreferences extends PreferenceFragment { |
| updatePreferences(isEnabled); |
| setHasOptionsMenu(true); |
| + Bundle extras = getActivity().getIntent().getExtras(); |
|
gone
2016/10/13 01:03:11
Add another method to IntentUtils to handle this c
megjablon
2016/10/24 23:59:00
Using the existing safeGetBooleanExtra
|
| + |
| + if (extras != null) { |
| + mFromPromo = extras.getBoolean(DataReductionPromoSnackbarController.FROM_PROMO); |
| + } |
| } |
| @Override |
| public void onDestroy() { |
| super.onDestroy(); |
| + if (mFromPromo) { |
| + if (mIsEnabled) { |
| + DataReductionProxyUma.dataReductionProxyUIAction( |
| + DataReductionProxyUma.ACTION_SNACKBAR_LINK_CLICKED); |
| + return; |
| + } |
|
gone
2016/10/13 01:03:11
Could you integrate this into the conditional belo
megjablon
2016/10/24 23:59:00
Done.
|
| + DataReductionProxyUma.dataReductionProxyUIAction( |
| + DataReductionProxyUma.ACTION_SNACKBAR_LINK_CLICKED_DISABLED); |
| + return; |
| + } |
| + |
| int statusChange; |
| if (mWasEnabledAtCreation) { |
| statusChange = mIsEnabled |