From 8524d4f021ee76fb7d21a12db5e6a2d917bdd17b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Tue, 15 Sep 2015 23:09:43 -0700
Subject: [PATCH] Bug 1205139 - Get @mozilla.org/embedcomp/prompt-service;1 to
 instantiate correctly r=dhylands

---
 mobile/android/components/MobileComponents.manifest | 12 ++++++------
 mobile/android/components/moz.build                 |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mobile/android/components/MobileComponents.manifest b/mobile/android/components/MobileComponents.manifest
index 88f79fae3d8..4baa30e5446 100644
--- a/mobile/android/components/MobileComponents.manifest
+++ b/mobile/android/components/MobileComponents.manifest
@@ -45,6 +45,12 @@ contract @mozilla.org/content-permission/prompt;1 {C6E8C44D-9F39-4AF7-BCC0-76E38
 component {8f7002cb-e959-4f0a-a2e8-563232564385} WebappsUpdateTimer.js
 contract @mozilla.org/webapps-update-timer;1 {8f7002cb-e959-4f0a-a2e8-563232564385}
 category update-timer WebappsUpdateTimer @mozilla.org/webapps-update-timer;1,getService,webapp-background-update-timer,browser.webapps.updateInterval,86400
+
+# PromptService.js
+component {9a61149b-2276-4a0a-b79c-be994ad106cf} PromptService.js
+contract @mozilla.org/prompter;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
+contract @mozilla.org/embedcomp/prompt-service;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
+category wakeup-request PromptService @mozilla.org/embedcomp/prompt-service;1,nsIPromptService,getService,Prompt:Call
 #endif
 
 # XPIDialogService.js
@@ -55,12 +61,6 @@ contract @mozilla.org/addons/web-install-prompt;1 {c1242012-27d8-477e-a0f1-0b098
 component {e9d277a0-268a-4ec2-bb8c-10fdf3e44611} HelperAppDialog.js
 contract @mozilla.org/helperapplauncherdialog;1 {e9d277a0-268a-4ec2-bb8c-10fdf3e44611}
 
-# PromptService.js
-component {9a61149b-2276-4a0a-b79c-be994ad106cf} PromptService.js
-contract @mozilla.org/prompter;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
-contract @mozilla.org/embedcomp/prompt-service;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
-category wakeup-request PromptService @mozilla.org/embedcomp/prompt-service;1,nsIPromptService,getService,Prompt:Call
-
 # BrowserCLH.js
 component {be623d20-d305-11de-8a39-0800200c9a66} BrowserCLH.js application={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 contract @mozilla.org/browser/browser-clh;1 {be623d20-d305-11de-8a39-0800200c9a66}
diff --git a/mobile/android/components/moz.build b/mobile/android/components/moz.build
index 5527c1bfc47..0f1313cadbb 100644
--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -23,7 +23,6 @@ EXTRA_COMPONENTS += [
     'HelperAppDialog.js',
     'LoginManagerPrompter.js',
     'NSSDialogService.js',
-    'PromptService.js',
     'SiteSpecificUserAgent.js',
     'Snippets.js',
     'TabSource.js',
@@ -33,6 +32,7 @@ EXTRA_COMPONENTS += [
 if not CONFIG['MOZ_B2GDROID']:
     EXTRA_COMPONENTS += [
         'ContentPermissionPrompt.js',
+        'PromptService.js',
         'SessionStore.js',
         'WebappsUpdateTimer.js',
     ]