From e6a5d4b82c5ec688894f01078bb94beb21d159ee Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Tue, 15 Apr 2014 12:16:19 +0200
Subject: [PATCH] Backed out changeset ec54368243da (bug 776027)

---
 mobile/android/app/mobile.js                  |  2 --
 mobile/android/components/ActivitiesGlue.js   | 31 -------------------
 .../components/MobileComponents.manifest      |  4 ---
 mobile/android/components/moz.build           |  1 -
 mobile/android/installer/package-manifest.in  |  8 -----
 5 files changed, 46 deletions(-)
 delete mode 100644 mobile/android/components/ActivitiesGlue.js

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 72ea2c8693d..93b37060be7 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -590,8 +590,6 @@ pref("image.mem.min_discard_timeout_ms", 10000);
 #ifdef NIGHTLY_BUILD
 // Shumway component (SWF player) is disabled by default. Also see bug 904346.
 pref("shumway.disabled", true);
-// Enabled system messages for web activity support
-pref("dom.sysmsg.enabled", true);
 #endif
 
 // enable touch events interfaces
diff --git a/mobile/android/components/ActivitiesGlue.js b/mobile/android/components/ActivitiesGlue.js
deleted file mode 100644
index d111d2ec005..00000000000
--- a/mobile/android/components/ActivitiesGlue.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict"
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Messaging.jsm");
-
-function ActivitiesGlue() { }
-
-ActivitiesGlue.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIActivityUIGlue]),
-  classID: Components.ID("{e4deb5f6-d5e3-4fce-bc53-901dd9951c48}"),
-
-  // Ignore aActivities results on Android, go straight to Android intents.
-  chooseActivity: function ap_chooseActivity(aOptions, aActivities, aCallback) {
-    sendMessageToJava({
-      type: "WebActivity:Open",
-      activity: { name: aOptions.name, data: aOptions.data }
-    }, (result) => {
-      aCallback.handleEvent(Ci.nsIActivityUIGlueCallback.NATIVE_ACTIVITY, result);
-    });
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ActivitiesGlue]);
diff --git a/mobile/android/components/MobileComponents.manifest b/mobile/android/components/MobileComponents.manifest
index 17054f73ac7..3972529c4ee 100644
--- a/mobile/android/components/MobileComponents.manifest
+++ b/mobile/android/components/MobileComponents.manifest
@@ -118,7 +118,3 @@ category update-timer WebappsUpdateTimer @mozilla.org/webapps-update-timer;1,get
 # ColorPicker.js
 component {430b987f-bb9f-46a3-99a5-241749220b29} ColorPicker.js
 contract @mozilla.org/colorpicker;1 {430b987f-bb9f-46a3-99a5-241749220b29}
-
-# ActivitiesGlue.js
-component {e4deb5f6-d5e3-4fce-bc53-901dd9951c48} ActivitiesGlue.js
-contract @mozilla.org/dom/activities/ui-glue;1 {e4deb5f6-d5e3-4fce-bc53-901dd9951c48}
diff --git a/mobile/android/components/moz.build b/mobile/android/components/moz.build
index 3b9c8b787ff..82976a07411 100644
--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -11,7 +11,6 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'MobileComponents'
 
 EXTRA_COMPONENTS += [
-    'ActivitiesGlue.js',
     'AddonUpdateService.js',
     'BlocklistPrompt.js',
     'ColorPicker.js',
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index b8fa9f2f4b7..6b824879e14 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -134,7 +134,6 @@
 @BINPATH@/components/directory.xpt
 @BINPATH@/components/docshell.xpt
 @BINPATH@/components/dom.xpt
-@BINPATH@/components/dom_activities.xpt
 @BINPATH@/components/dom_apps.xpt
 @BINPATH@/components/dom_base.xpt
 @BINPATH@/components/dom_canvas.xpt
@@ -399,13 +398,6 @@
 @BINPATH@/components/SystemMessageManager.js
 @BINPATH@/components/SystemMessageManager.manifest
 
-@BINPATH@/components/Activities.manifest
-@BINPATH@/components/ActivitiesGlue.js
-@BINPATH@/components/ActivityProxy.js
-@BINPATH@/components/ActivityRequestHandler.js
-@BINPATH@/components/ActivityWrapper.js
-@BINPATH@/components/ActivityMessageConfigurator.js
-
 @BINPATH@/components/TCPSocket.js
 @BINPATH@/components/TCPSocketParentIntermediary.js
 @BINPATH@/components/TCPServerSocket.js