Bug 924032 - Followup to close the loop r=me a=koi
authorFabrice Desré <fabrice@mozilla.com>
Tue, 15 Oct 2013 09:36:24 -0700
changeset 160815 ed279034d0661e7886c3abcb21e04e5758f25ce6
parent 160814 ec442fac77c552085a95948ee6ffe3d031d0640f
child 160816 88fc2da6856b5d1a916b1f764a4034abde586274
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, koi
bugs924032
milestone26.0a2
Bug 924032 - Followup to close the loop r=me a=koi
b2g/chrome/content/shell.js
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -558,19 +558,16 @@ var shell = {
       isActivity: (msg.type == 'activity'),
       onlyShowApp: msg.onlyShowApp,
       showApp: msg.showApp,
       target: msg.target,
       expectingSystemMessage: true,
       extra: msg.extra
     }
     this.sendCustomEvent('open-app', payload);
-    // XXX Remove once the gaia part of bug 924032 has landed.
-    payload.type = 'open-app';
-    this.sendChromeEvent(payload);
   },
 
   receiveMessage: function shell_receiveMessage(message) {
     var activities = { 'content-handler': { name: 'view', response: null },
                        'dial-handler':    { name: 'dial', response: null },
                        'mail-handler':    { name: 'new',  response: null },
                        'sms-handler':     { name: 'new',  response: null },
                        'file-picker':     { name: 'pick', response: 'file-picked' } };
@@ -963,39 +960,32 @@ var WebappsHelper = {
               url: "r",
               manifestURL: "r"
             },
             timestamp: json.timestamp,
             url: manifest.fullLaunchPath(json.startPoint),
             manifestURL: json.manifestURL
           }
           shell.sendEvent(getContentWindow(), "webapps-launch", payload);
-          // XXX Remove once the gaia side of bug 924032 lands.
-          payload.type = "webapps-launch";
-          delete payload.__exposedProps__;
-          shell.sendChromeEvent(payload);
         });
         break;
       case "webapps-ask-install":
         let id = this.registerInstaller(json);
         shell.sendChromeEvent({
           type: "webapps-ask-install",
           id: id,
           app: json.app
         });
         break;
       case "webapps-close":
         shell.sendEvent(shell.getContentWindow(), "webapps-close",
           {
             __exposedProps__: { "manifestURL": "r" },
             "manifestURL": json.manifestURL
           });
-        // XXX Remove once the gaia side of bug 924032 lands.
-        shell.sendChromeEvent({ type: "webapps-close",
-                                "manifestURL": json.manifestURL });
         break;
     }
   }
 }
 
 let IndexedDBPromptHelper = {
   _quotaPrompt: "indexedDB-quota-prompt",
   _quotaResponse: "indexedDB-quota-response",