Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: mobile/android/chrome/content/browser.js

Issue 4819695857303552: Issue 2561 - Installing extensions should not be allowed until official support lands (Closed)
Patch Set: Created May 22, 2015, 1:41 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mobile/android/base/AndroidManifest.xml.in ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mobile/android/chrome/content/browser.js
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 1f1fb6f45064cf9327af29444a31a69f0a49787c..6b05a8dc6b679ddb0d3983f96020758ff911611d 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6080,6 +6080,11 @@ var XPInstallObserver = {
let notificationName, buttons, message;
let strings = Strings.browser;
let enabled = true;
+
+ // We are forcing xpinstall.enabled to false here because of
+ // https://issues.adblockplus.org/ticket/2561
+ Services.prefs.setBoolPref("xpinstall.enabled", false);
+
try {
enabled = Services.prefs.getBoolPref("xpinstall.enabled");
}
@@ -6087,7 +6092,10 @@ var XPInstallObserver = {
if (!enabled) {
notificationName = "xpinstall-disabled";
- if (Services.prefs.prefIsLocked("xpinstall.enabled")) {
+ // We force xpinstall.enabled to be a locked pref here because of
+ // https://issues.adblockplus.org/ticket/2561
+ // if (Services.prefs.prefIsLocked("xpinstall.enabled")) {
+ if (true) {
message = strings.GetStringFromName("xpinstallDisabledMessageLocked");
buttons = [];
} else {
« no previous file with comments | « mobile/android/base/AndroidManifest.xml.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld