chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java - Issue 2106823002: Disable the autoplay setting entry when Data Saver is ON.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

Issue 2106823002: Disable the autoplay setting entry when Data Saver is ON. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@autoplay-string

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java ('k') | chrome/android/java/strings/android_chrome_strings.grd » ('j') | chrome/android/java/strings/android_chrome_strings.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

index 206afcf90bab9dd698e2ce71741ccca97e0a1094..f9fec7ab8438ea2d0527744a05eaa3a71dfa4bcb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

@@ -14,6 +14,7 @@ import org.chromium.base.CommandLine;

import org.chromium.base.FieldTrialList;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.ContentSettingsType;

+import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;

import org.chromium.chrome.browser.preferences.LocationSettings;

import org.chromium.chrome.browser.preferences.PrefServiceBridge;

@@ -205,7 +206,11 @@ public class SiteSettingsPreferences extends PreferenceFragment

int contentType = keyToContentSettingsType(prefName);

p.setTitle(ContentSettingsResources.getTitle(contentType));

- if (COOKIES_KEY.equals(prefName) && checked

+ if (AUTOPLAY_KEY.equals(prefName) && checked

Miguel Garcia 2016/06/28 16:04:05 Can you add a comment explaining what's going on h

mlamouri (slow - plz ping) 2016/06/28 16:09:51 Done. Also fixed the logic (ie. remove `checked`).

+ && DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) {

+ p.setSummary(ContentSettingsResources.getAutoplayDisabledByDataSaverSummary());

+ p.setEnabled(false);

+ } else if (COOKIES_KEY.equals(prefName) && checked

&& prefServiceBridge.isBlockThirdPartyCookiesEnabled()) {

p.setSummary(ContentSettingsResources.getCookieAllowedExceptThirdPartySummary());

} else if (LOCATION_KEY.equals(prefName) && checked