rebasing

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -410,7 +410,7 @@ diff --git a/suite/components/bindings/findbar.xml b/suite/components/bindings/f
 diff --git a/suite/components/bindings/notification.xml b/suite/components/bindings/notification.xml
 --- a/suite/components/bindings/notification.xml
 +++ b/suite/components/bindings/notification.xml
-@@ -2119,18 +2119,19 @@
+@@ -2123,18 +2123,19 @@
                  optInCB.checked = Services.prefs.getBoolPref("dom.ipc.plugins.reportCrashURL");
              }
  
@@ -818,7 +818,7 @@ diff --git a/suite/components/nsGopherProtocolStubHandler.js b/suite/components/
 diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
 --- a/suite/components/nsSuiteGlue.js
 +++ b/suite/components/nsSuiteGlue.js
-@@ -1533,20 +1533,20 @@ SuiteGlue.prototype = {
+@@ -1505,20 +1505,20 @@ SuiteGlue.prototype = {
      } catch (e) {
        Cu.reportError("Error displaying tab received by Sync: " + e);
      }
@@ -843,7 +843,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
   * simple permission prompts when content requests additional
   * capabilities.
   *
-@@ -1593,17 +1593,17 @@ var ContentPermissionIntegration = {
+@@ -1565,17 +1565,17 @@ var ContentPermissionIntegration = {
    },
  };