Issue 2483 - Give Adblock Browser its own app ID

adblockplus/issue-2510.patch

Index: adblockplus/issue-2510.patch
===================================================================
new file mode 100644
--- /dev/null
+++ b/adblockplus/issue-2510.patch
@@ -0,0 +1,61 @@
+# HG changeset patch
+# User Felix Dahlke <felix@adblockplus.org>
+# Date 1431547667 -7200
+#      Wed May 13 22:07:47 2015 +0200
+# Node ID 76ddc7678a914cbcdcc2cd8132c09e8bcdd10125
+# Parent  ae1c968784024553c3a2eaf4c446757798be7e13
+Issue 2510 - Support Adblock Browser
+
+diff -r ae1c96878402 -r 76ddc7678a91 chrome.manifest
+--- a/chrome.manifest	Tue May 12 23:01:08 2015 +0200
++++ b/chrome.manifest	Wed May 13 22:07:47 2015 +0200
+@@ -3,4 +3,4 @@
+ locale    adblockplus {{LOCALE}} chrome/locale/{{LOCALE}}/
+ 
+ # fennec settings
+-override chrome://adblockplus/content/ui/settings.xul chrome://adblockplus/content/ui/fennecSettings.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={aa3c5121-dab2-40e2-81ca-7ea25febc110}
++override chrome://adblockplus/content/ui/settings.xul chrome://adblockplus/content/ui/fennecSettings.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={55aba3ac-94d3-41a8-9e25-5c21fe874539}
+diff -r ae1c96878402 -r 76ddc7678a91 dependencies
+--- a/dependencies	Tue May 12 23:01:08 2015 +0200
++++ b/dependencies	Wed May 13 22:07:47 2015 +0200
+@@ -1,4 +1,4 @@
+ _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
+ _self = buildtools/ensure_dependencies.py
+-buildtools = buildtools hg:97e2e12af6e8 git:ef69bbc
++buildtools = buildtools hg:f9f01a4c16af git:
+ adblockplusui = adblockplusui hg:75a50600e10a git:7ebacdc
+diff -r ae1c96878402 -r 76ddc7678a91 lib/appSupport.js
+--- a/lib/appSupport.js	Tue May 12 23:01:08 2015 +0200
++++ b/lib/appSupport.js	Wed May 13 22:07:47 2015 +0200
+@@ -690,6 +690,7 @@
+   }
+ 
+   case "fennec2":
++  case "adblockbrowser":
+   {
+     exports.isKnownWindow = (window) => window.document.documentElement.id == "main-window";
+ 
+diff -r ae1c96878402 -r 76ddc7678a91 lib/objectTabs.js
+--- a/lib/objectTabs.js	Tue May 12 23:01:08 2015 +0200
++++ b/lib/objectTabs.js	Wed May 13 22:07:47 2015 +0200
+@@ -178,7 +178,8 @@
+   {
+     // Object tabs aren't usable in Fennec
+     let {application} = require("info");
+-    if (application == "fennec" || application == "fennec2")
++    if (application == "fennec" || application == "fennec2" ||
++        application == "adblockbrowser")
+       return;
+ 
+     let {Prefs} = require("prefs");
+diff -r ae1c96878402 -r 76ddc7678a91 metadata.gecko
+--- a/metadata.gecko	Tue May 12 23:01:08 2015 +0200
++++ b/metadata.gecko	Wed May 13 22:07:47 2015 +0200
+@@ -34,6 +34,7 @@
+ thunderbird=29.0/39.0
+ seamonkey=2.26/2.36
+ toolkit=29.0/39.0
++adblockbrowser=1.0/1.0
+ 
+ [mapping]
+ chrome/content/ui/firstRun.html = adblockplusui/firstRun.html