Revert "Bug#982491 Group apps in activities chains in the same proces…

…s a=fabrice" This reverts commit b0d0538.
mozilla-b2g · Mar 26, 2014 · 3fdf625 · 3fdf625
1 parent f436448
commit 3fdf625
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/apps/system/js/activity_window.js b/apps/system/js/activity_window.js
@@ -256,8 +256,7 @@
       manifest: this.manifest,
       manifestURL: this.manifestURL,
       window_name: 'inline' + this.instanceID,
-      oop: true,
-      parentApp: this.parentApp
+      oop: true
     });
     this.element =
       document.getElementById('activity-window-' + this.instanceID);

diff --git a/apps/system/js/app_window_factory.js b/apps/system/js/app_window_factory.js
@@ -59,7 +59,6 @@
           }
           config.changeURL = !detail.onlyShowApp;
           config.stayBackground = !detail.showApp;
-          config.parentApp = detail.extra.manifestURL;
           // TODO: Create activity window instance
           // or background app window instance for system message here.
           this.publish('launchapp', config);

diff --git a/apps/system/js/browser_frame.js b/apps/system/js/browser_frame.js
@@ -57,10 +57,6 @@ var BrowserFrame = (function invocation() {
       browser.setAttribute('mozasyncpanzoom', 'true');
     }
 
-    if (config.parentApp) {
-      browser.setAttribute('parentapp', config.parentApp);
-    }
-
     setMozAppType(browser, config);
 
     if (config.url)

diff --git a/apps/system/js/window_manager.js b/apps/system/js/window_manager.js
@@ -741,14 +741,13 @@ var WindowManager = (function() {
       }
     });
 
-  function createFrame(origFrame, origin, url, name, manifest, manifestURL, parentApp) {
+  function createFrame(origFrame, origin, url, name, manifest, manifestURL) {
     var browser_config = {
       origin: origin,
       url: url,
       name: name,
       manifest: manifest,
-      manifestURL: manifestURL,
-      parentApp: parentApp
+      manifestURL: manifestURL
     };
 
     // TODO: Move into browser configuration helper.
@@ -808,10 +807,10 @@ var WindowManager = (function() {
   }
 
   function appendFrame(origFrame, origin, url, name, manifest, manifestURL,
-                       expectingSystemMessage, stayBackground, parentApp) {
+                       expectingSystemMessage, stayBackground) {
     // Create the <iframe mozbrowser mozapp> that hosts the app
     var frame =
-        createFrame(origFrame, origin, url, name, manifest, manifestURL, parentApp);
+        createFrame(origFrame, origin, url, name, manifest, manifestURL);
     var iframe = frame.firstChild;
     frame.id = 'appframe' + nextAppId++;
     iframe.dataset.frameType = 'window';
@@ -970,8 +969,7 @@ var WindowManager = (function() {
       } else {
         if (!isRunning(config.origin)) {
           appendFrame(null, config.origin, config.url,
-                      config.name, config.manifest, config.manifestURL,
-                      false, false, config.parentApp);
+                      config.name, config.manifest, config.manifestURL);
         }
         // TODO: Move below iframe hack into app window.
         runningApps[config.origin].iframe.dataset.start = startTime;
@@ -1009,7 +1007,7 @@ var WindowManager = (function() {
                                 config.name, config.manifest,
                                 config.manifestURL,
                                 /* expectingSystemMessage */
-                                true, config.stayBackground, config.parentApp);
+                                true, config.stayBackground);
 
           // set the size of the iframe
           // so Cards View will get a correct screenshot of the frame
@@ -1147,7 +1145,7 @@ var WindowManager = (function() {
       app = appendFrame(iframe, config.origin, config.url, config.title, {
         'name': config.title
       }, null, /* expectingSystemMessage */ false,
-      /* stayBackground */ false, config.parentApp);
+      /* stayBackground */ false);
 
       // XXX: Move this into app window.
       // Set the window name in order to reuse this app if we try to open