From 95171a3069d3c8fce35c26dbc7c8a044952fd5ce Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Mon, 18 May 2015 17:40:30 -0700
Subject: [PATCH] Bug 1147064 - Add positive/negative to buttons. r=margaret

--HG--
extra : rebase_source : 4b94763957288a5f7dca559d6ad8cd798033125b
---
 mobile/android/chrome/content/OfflineApps.js      |  3 ++-
 mobile/android/chrome/content/PluginHelper.js     |  3 ++-
 mobile/android/chrome/content/WebrtcUI.js         |  3 ++-
 mobile/android/chrome/content/browser.js          | 15 ++++++++++-----
 .../android/components/ContentPermissionPrompt.js |  3 ++-
 mobile/android/components/LoginManagerPrompter.js |  6 ++++--
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/mobile/android/chrome/content/OfflineApps.js b/mobile/android/chrome/content/OfflineApps.js
index 4393efe84dde..1acc128d0412 100644
--- a/mobile/android/chrome/content/OfflineApps.js
+++ b/mobile/android/chrome/content/OfflineApps.js
@@ -39,7 +39,8 @@ var OfflineApps = {
       label: strings.GetStringFromName("offlineApps.allow"),
       callback: function() {
         OfflineApps.allowSite(aContentWindow.document);
-      }
+      },
+      positive: true
     }];
 
     let requestor = BrowserApp.manifest ? "'" + BrowserApp.manifest.name + "'" : host;
diff --git a/mobile/android/chrome/content/PluginHelper.js b/mobile/android/chrome/content/PluginHelper.js
index 34955fccda76..4c4a81198fb3 100644
--- a/mobile/android/chrome/content/PluginHelper.js
+++ b/mobile/android/chrome/content/PluginHelper.js
@@ -45,7 +45,8 @@ var PluginHelper = {
             Services.perms.add(uri, "plugins", Ci.nsIPermissionManager.ALLOW_ACTION);
 
           PluginHelper.playAllPlugins(aTab.browser.contentWindow);
-        }
+        },
+        positive: true
       }
     ];
 
diff --git a/mobile/android/chrome/content/WebrtcUI.js b/mobile/android/chrome/content/WebrtcUI.js
index 854e85f6b204..1efe59b34632 100644
--- a/mobile/android/chrome/content/WebrtcUI.js
+++ b/mobile/android/chrome/content/WebrtcUI.js
@@ -113,7 +113,8 @@ var WebrtcUI = {
           allowedDevices.AppendElement(videoDevices[videoId]);
 
         Services.obs.notifyObservers(allowedDevices, "getUserMedia:response:allow", aCallID);
-      }
+      },
+      positive: true
     }];
   },
 
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 6e366436e58c..31e2753cbe72 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3064,7 +3064,8 @@ var LightWeightThemeWebInstaller = {
       label: allowButtonText,
       callback: function () {
         LightWeightThemeWebInstaller._install(data);
-      }
+      },
+      positive: true
     }];
 
     NativeWindow.doorhanger.show(message, "Personas", buttons, BrowserApp.selectedTab.id);
@@ -6259,7 +6260,8 @@ var XPInstallObserver = {
               // Kick off the install
               installInfo.install();
               return false;
-            }
+            },
+            positive: true
           }];
         }
         NativeWindow.doorhanger.show(message, aTopic, buttons, tab.id);
@@ -6353,7 +6355,8 @@ var XPInstallObserver = {
           let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
           appStartup.quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
         }
-      }
+      },
+      positive: true
     }];
 
     let message = Strings.browser.GetStringFromName("notificationRestart.normal");
@@ -6663,7 +6666,8 @@ var PopupBlockerObserver = {
                 PopupBlockerObserver.allowPopupsForSite(true);
 
               PopupBlockerObserver.showPopupsForSite();
-            }
+            },
+            positive: true
           }
         ];
 
@@ -6779,7 +6783,8 @@ var IndexedDB = {
       callback: function() {
         clearTimeout(timeoutId);
         observer.observe(null, responseTopic, Ci.nsIPermissionManager.ALLOW_ACTION);
-      }
+      },
+      positive: true
     }];
 
     let options = { checkbox: Strings.browser.GetStringFromName("offlineApps.dontAskAgain") };
diff --git a/mobile/android/components/ContentPermissionPrompt.js b/mobile/android/components/ContentPermissionPrompt.js
index 78f4deb9f3ae..aca7c338b906 100644
--- a/mobile/android/components/ContentPermissionPrompt.js
+++ b/mobile/android/components/ContentPermissionPrompt.js
@@ -120,7 +120,8 @@ ContentPermissionPrompt.prototype = {
         }
 
         request.allow();
-      }
+      },
+      positive: true
     }];
 
     let requestor = chromeWin.BrowserApp.manifest ? "'" + chromeWin.BrowserApp.manifest.name + "'" : request.principal.URI.host;
diff --git a/mobile/android/components/LoginManagerPrompter.js b/mobile/android/components/LoginManagerPrompter.js
index c47bfc892f9e..64cb2c0b8cc6 100644
--- a/mobile/android/components/LoginManagerPrompter.js
+++ b/mobile/android/components/LoginManagerPrompter.js
@@ -225,7 +225,8 @@ LoginManagerPrompter.prototype = {
                     }
                     pwmgr.addLogin(aLogin);
                     promptHistogram.add(PROMPT_ADD);
-                }
+                },
+                positive: true
             }
         ];
 
@@ -282,7 +283,8 @@ LoginManagerPrompter.prototype = {
                 callback:  function() {
                     self._updateLogin(aOldLogin, aNewPassword);
                     promptHistogram.add(PROMPT_UPDATE);
-                }
+                },
+                positive: true
             }
         ];