chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java - Issue 2008813002: Remove the simplified-fullscreen-ui flag on Android.

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/SingleCategoryPreferences.java

Issue 2008813002: Remove the simplified-fullscreen-ui flag on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@android-fullscreen-settings-deprecation

Patch Set: Fix compile. 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') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b12bb5c92b73e05fc001f2623ceed95da392fbd2..e49d6d8ecbe758cc94a0a50fe47aeaa85679e4fd 100644

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

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

@@ -21,7 +21,6 @@ import android.widget.ListView;

import android.widget.TextView;

import org.chromium.chrome.R;

-import org.chromium.chrome.browser.ChromeFeatureList;

import org.chromium.chrome.browser.help.HelpAndFeedback;

import org.chromium.chrome.browser.media.cdm.MediaDrmCredentialManager;

import org.chromium.chrome.browser.media.cdm.MediaDrmCredentialManager.MediaDrmCredentialManagerCallback;

@@ -616,10 +615,10 @@ public class SingleCategoryPreferences extends PreferenceFragment

} else if (mCategory.showFullscreenSites()) {

globalToggle.setChecked(

PrefServiceBridge.getInstance().isFullscreenAllowed());

- // With the simplified flag enabled, the fullscreen global toggle cannot be

- // disabled.

- globalToggle.setEnabled(

- !ChromeFeatureList.isEnabled("ViewsSimplifiedFullscreenUI"));

+ // The fullscreen global toggle cannot be disabled.

+ // TODO(mgiuca): Remove this setting entirely (requires deleting all the data;

+ // see https://crbug.com/591896).

+ globalToggle.setEnabled(false);

} else if (mCategory.showGeolocationSites()) {

globalToggle.setChecked(

LocationSettings.getInstance().isChromeLocationSettingEnabled());