Remove "enable" from menu items (#398) (c7206f4d) · Commits · e / os / Browser

build/patches/Add-global-menu-entry-to-toggle-AdBlocker.patch→build/patches/Add-global-menu-entry-to-toggle-ad-blocker.patch

+11 −11

Original line number	Diff line number	Diff line
		From: csagan5 <32685696+csagan5@users.noreply.github.com>
		Date: Sat, 14 Sep 2019 10:19:07 +0200
		Subject: Add global menu entry to toggle AdBlocker
		Subject: Add global menu entry to toggle ad blocker

		---
		chrome/android/java/res/menu/custom_tabs_menu.xml \| 12 +++++++
		@@ -116,9 +116,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
		}

		+ /**
		+ * Updates the enable AdBlock item's state.
		+ * Updates the ad blocker item's state.
		+ *
		+ * @param menu {@link Menu} for enable adblock
		+ * @param menu {@link Menu} to enable ad blocker
		+ * @param currentTab Current tab being displayed.
		+ */
		+ protected void updateEnableAdBlockMenuItem(
		@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
		+ MenuItem enableMenuCheck = menu.findItem(R.id.enable_adblock_check_id);
		+
		+
		+ // Hide enable adblock on all chrome:// pages except for the NTP.
		+ // Hide Block ads on all chrome:// pages except for the NTP.
		+ String url = currentTab.getUrl();
		+ boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
		+ \|\| url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
		@@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
		+
		+ boolean adBlockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
		+
		+ // Mark the checkbox if adblock is globally activate.
		+ // Mark the checkbox if ad blocker is globally activated.
		+ enableMenuCheck.setChecked(adBlockEnabled);
		+
		+ // This title doesn't seem to be displayed by Android, but it is used to set up
		@@ -175,14 +175,14 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
		Turn on Request desktop site
		</message>
		+
		+ <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable AdBlock engine for the page. [CHAR-LIMIT=27]">
		+ Enable AdBlock
		+ <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable ad blocker engine for the page. [CHAR-LIMIT=27]">
		+ Block ads
		+ </message>
		+ <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Enable AdBlock is selected.">
		+ Turn off AdBlock
		+ <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Block ads is selected.">
		+ Turn off ad blocking
		+ </message>
		+ <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Enable AdBlock is unselected.">
		+ Turn on AdBlock
		+ <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Block ads is unselected.">
		+ Turn on ad blocking
		+ </message>
		+
		<message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">

build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch

+1 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
		</message>
		+
		+ <message name="IDS_MENU_ENABLE_JAVASCRIPT" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable JavaScript support for the page. [CHAR-LIMIT=27]">
		+ Enable JavaScript
		+ JavaScript
		+ </message>
		+ <message name="IDS_MENU_ENABLE_JAVASCRIPT_ON" desc="Accessibility description for when Enable JavaScript is selected.">
		+ Turn off JavaScript