Backed out changeset f8c51b2092ca (bug 776027)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 15 Apr 2014 12:16:21 +0200
changeset 197018 d7f6864d857078e9bec2a884b0383036805706c8
parent 197017 c1019516b76efd9476a2a76ebfefb19c747a43cb
child 197019 c300fbbd1b1e7da6c3b7e82ce505de7d94b3d999
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs776027
milestone31.0a1
backs outf8c51b2092cad9b1d86035a80bf7074e0741f58e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset f8c51b2092ca (bug 776027)
b2g/components/ActivitiesGlue.js
b2g/components/B2GComponents.manifest
dom/activities/interfaces/nsIActivityUIGlue.idl
dom/activities/src/ActivitiesService.jsm
--- a/b2g/components/ActivitiesGlue.js
+++ b/b2g/components/ActivitiesGlue.js
@@ -51,24 +51,24 @@ ActivitiesDialog.prototype = {
       activity.callback.handleEvent(evt.detail.value !== undefined
                                       ? evt.detail.value
                                       : -1);
     });
 
     SystemAppProxy.dispatchEvent(detail);
   },
 
-  chooseActivity: function ap_chooseActivity(aOptions, aActivities, aCallback) {
+  chooseActivity: function ap_chooseActivity(aName, aActivities, aCallback) {
     this.activities.push({
-      name: aOptions.name,
+      name: aName,
       list: aActivities,
       callback: aCallback
     });
     Services.tm.currentThread.dispatch(this, Ci.nsIEventTarget.DISPATCH_NORMAL);
   },
 
-  classID: Components.ID("{3a54788b-48cc-4ab4-93d6-0d6a8ef74f8e}"),
+  classID: Components.ID("{70a83123-7467-4389-a309-3e81c74ad002}"),
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIActivityUIGlue, Ci.nsIRunnable])
 }
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ActivitiesDialog]);
 
--- a/b2g/components/B2GComponents.manifest
+++ b/b2g/components/B2GComponents.manifest
@@ -16,18 +16,18 @@ contract @mozilla.org/updates/update-pro
 #endif
 
 # DirectoryProvider.js
 component {9181eb7c-6f87-11e1-90b1-4f59d80dd2e5} DirectoryProvider.js
 contract @mozilla.org/browser/directory-provider;1 {9181eb7c-6f87-11e1-90b1-4f59d80dd2e5}
 category xpcom-directory-providers browser-directory-provider @mozilla.org/browser/directory-provider;1
 
 # ActivitiesGlue.js
-component {3a54788b-48cc-4ab4-93d6-0d6a8ef74f8e} ActivitiesGlue.js
-contract @mozilla.org/dom/activities/ui-glue;1 {3a54788b-48cc-4ab4-93d6-0d6a8ef74f8e}
+component {70a83123-7467-4389-a309-3e81c74ad002} ActivitiesGlue.js
+contract @mozilla.org/dom/activities/ui-glue;1 {70a83123-7467-4389-a309-3e81c74ad002}
 
 # ProcessGlobal.js
 component {1a94c87a-5ece-4d11-91e1-d29c29f21b28} ProcessGlobal.js
 contract @mozilla.org/b2g-process-global;1 {1a94c87a-5ece-4d11-91e1-d29c29f21b28}
 category app-startup ProcessGlobal service,@mozilla.org/b2g-process-global;1
 
 # ContentHandler.js
 component {d18d0216-d50c-11e1-ba54-efb18d0ef0ac} ContentHandler.js
--- a/dom/activities/interfaces/nsIActivityUIGlue.idl
+++ b/dom/activities/interfaces/nsIActivityUIGlue.idl
@@ -8,18 +8,18 @@
 interface nsIActivityUIGlueCallback : nsISupports
 {
     void handleEvent(in long choice);
 };
 
 /**
   * To be implemented by @mozilla.org/dom/activities/ui-glue;1
   */
-[scriptable, uuid(03e6743c-2fc3-43fa-bcb3-0476947c8ac5)]
+[scriptable, uuid(8624ad73-937a-400f-9d93-39ab5449b867)]
 interface nsIActivityUIGlue : nsISupports
 {
     /**
-      * @param options     The ActivityOptions object in the form of { name: "send", data: { ... } }
+      * @param name        The name of the activity to handle (eg. "share", "pick").
       * @param activities  A json blob which is an array of { "title":"...", "icon":"..." }.
       * @param onresult    The callback to send the index of the choosen activity. Send -1 if no choice is made.
       */
-    void chooseActivity(in jsval options, in jsval activities, in nsIActivityUIGlueCallback onresult);
+    void chooseActivity(in DOMString title, in jsval activities, in nsIActivityUIGlueCallback onresult);
 };
--- a/dom/activities/src/ActivitiesService.jsm
+++ b/dom/activities/src/ActivitiesService.jsm
@@ -259,17 +259,17 @@ let Activities = {
           // No need to notify observers, since we don't want the caller
           // to be raised on the foreground that quick.
           delete Activities.callers[aMsg.id];
         }
       };
 
       let glue = Cc["@mozilla.org/dom/activities/ui-glue;1"]
                    .createInstance(Ci.nsIActivityUIGlue);
-      glue.chooseActivity(aMsg.options, aResults.options, getActivityChoice);
+      glue.chooseActivity(aResults.name, aResults.options, getActivityChoice);
     };
 
     let errorCb = function errorCb(aError) {
       // Something unexpected happened. Should we send an error back?
       debug("Error in startActivity: " + aError + "\n");
     };
 
     let matchFunc = function matchFunc(aResult) {