chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.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/ContentSettingsResources.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/fullscreen/FullscreenInfoBarDelegate.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java » ('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/ContentSettingsResources.java

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

index 6f8e791e46e027a01102916282eb80bdfe515172..771b1d221a11ab3814b42c51edf2d7558fc37d0c 100644

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

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

@@ -8,7 +8,6 @@ import android.annotation.SuppressLint;

import org.chromium.base.ThreadUtils;

import org.chromium.chrome.R;

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

import org.chromium.chrome.browser.ContentSettingsType;

import java.util.HashMap;

@@ -103,18 +102,12 @@ public class ContentSettingsResources {

new ResourceItem(R.drawable.permission_cookie, R.string.cookies_title,

R.string.cookies_title, ContentSetting.ALLOW, ContentSetting.BLOCK,

R.string.website_settings_category_cookie_allowed, 0));

- // In simplified fullscreen mode, the "on" case should be described as "Always allowed",

- // rather than just "Allowed". (It is disabled; this further clarifies that it is

- // deliberately disabled.)

- int fullscreenEnabledSummary =

- ChromeFeatureList.isEnabled("ViewsSimplifiedFullscreenUI")

- ? R.string.website_settings_category_always_allowed : 0;

localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN,

new ResourceItem(R.drawable.permission_fullscreen,

R.string.website_settings_fullscreen,

R.string.fullscreen_permission_title, ContentSetting.ALLOW,

- ContentSetting.ASK, fullscreenEnabledSummary,

- R.string.website_settings_category_fullscreen_ask));

+ ContentSetting.ASK,

+ R.string.website_settings_category_always_allowed, 0));

localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION,

new ResourceItem(R.drawable.permission_location,

R.string.website_settings_device_location,