From 11e4e3f5fd16f3935f7d44be64e8b8c47e548826 Mon Sep 17 00:00:00 2001
From: Gabor Krizsanits <gkrizsanits@mozilla.com>
Date: Mon, 1 Aug 2016 12:27:20 +0200
Subject: [PATCH] Bug 1285885 - Turn off PROMPT_ACTION permission hack for
 non-b2g builds. r=amarchesini

---
 extensions/cookie/nsPermissionManager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
index 78f889477bb6..f2b296c959e3 100644
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -1671,6 +1671,7 @@ nsPermissionManager::AddInternal(nsIPrincipal* aPrincipal,
         id = aID;
       }
 
+#ifdef MOZ_B2G
       // When we do the initial addition of the permissions we don't want to
       // inherit session specific permissions from other tabs or apps
       // so we ignore them and set the permission to PROMPT_ACTION if it was
@@ -1680,6 +1681,7 @@ nsPermissionManager::AddInternal(nsIPrincipal* aPrincipal,
         aPermission = nsIPermissionManager::PROMPT_ACTION;
         aExpireType = nsIPermissionManager::EXPIRE_NEVER;
       }
+#endif // MOZ_B2G
 
       entry->GetPermissions().AppendElement(PermissionEntry(id, typeIndex, aPermission,
                                                             aExpireType, aExpireTime,