From 5a3d2d1f5ad74d3dbbd5d51ac7c736c5d4b981a2 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Wed, 24 Jul 2013 11:29:04 -0400
Subject: [PATCH] Bug 817580 - Pref off new webapps actor features until we
 secure remote debugger connection. r=paul.rouget

---
 b2g/chrome/content/shell.js               | 19 +++++++++++-------
 modules/libpref/src/init/all.js           |  3 +++
 toolkit/devtools/server/actors/webapps.js | 24 ++++++++++++++---------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 061c1ab45aae..68b88d3f1400 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -977,14 +977,19 @@ let RemoteDebugger = {
       // Ask for remote connections.
       DebuggerServer.init(this.prompt.bind(this));
       DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webbrowser.js");
-      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/script.js");
-      DebuggerServer.addGlobalActor(DebuggerServer.ChromeDebuggerActor, "chromeDebugger");
-      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webconsole.js");
-      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/gcli.js");
-      if ("nsIProfiler" in Ci) {
-        DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/profiler.js");
+      // Until we implement unix domain socket, we enable content actors
+      // only on development devices
+      if (Services.prefs.getBoolPref("devtools.debugger.enable-content-actors")) {
+        DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/script.js");
+        DebuggerServer.addGlobalActor(DebuggerServer.ChromeDebuggerActor, "chromeDebugger");
+        DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webconsole.js");
+        DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/gcli.js");
+        if ("nsIProfiler" in Ci) {
+          DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/profiler.js");
+        }
+        DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
+        DebuggerServer.enableWebappsContentActor = true;
       }
-      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
       DebuggerServer.addActors('chrome://browser/content/dbg-browser-actors.js');
       DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webapps.js");
     }
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 754eb33a1fd8..9cfc9632fe6d 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -454,6 +454,9 @@ pref("devtools.debugger.remote-port", 6000);
 // Force debugger server binding on the loopback interface
 pref("devtools.debugger.force-local", true);
 
+// Temporary setting to enable webapps actors
+pref("devtools.debugger.enable-content-actors", false);
+
 // view source
 pref("view_source.syntax_highlight", true);
 pref("view_source.wrap_long_lines", false);
diff --git a/toolkit/devtools/server/actors/webapps.js b/toolkit/devtools/server/actors/webapps.js
index 22d05f1f3ec4..6a359e3b63e0 100644
--- a/toolkit/devtools/server/actors/webapps.js
+++ b/toolkit/devtools/server/actors/webapps.js
@@ -572,15 +572,21 @@ WebappsActor.prototype = {
  * The request types this actor can handle.
  */
 WebappsActor.prototype.requestTypes = {
-  "install": WebappsActor.prototype.install,
-  "getAll": WebappsActor.prototype.getAll,
-  "launch": WebappsActor.prototype.launch,
-  "close": WebappsActor.prototype.close,
-  "uninstall": WebappsActor.prototype.uninstall,
-  "listRunningApps": WebappsActor.prototype.listRunningApps,
-  "getAppActor": WebappsActor.prototype.getAppActor,
-  "watchApps": WebappsActor.prototype.watchApps,
-  "unwatchApps": WebappsActor.prototype.unwatchApps
+  "install": WebappsActor.prototype.install
 };
 
+// Until we implement unix domain socket, we only enable app install
+// only on production devices
+if (Services.prefs.getBoolPref("devtools.debugger.enable-content-actors")) {
+  let requestTypes = WebappsActor.prototype.requestTypes;
+  requestTypes.getAll = WebappsActor.prototype.getAll;
+  requestTypes.launch = WebappsActor.prototype.launch;
+  requestTypes.close  = WebappsActor.prototype.close;
+  requestTypes.uninstall = WebappsActor.prototype.uninstall;
+  requestTypes.listRunningApps = WebappsActor.prototype.listRunningApps;
+  requestTypes.getAppActor = WebappsActor.prototype.getAppActor;
+  requestTypes.watchApps = WebappsActor.prototype.watchApps;
+  requestTypes.unwatchApps = WebappsActor.prototype.unwatchApps;
+}
+
 DebuggerServer.addGlobalActor(WebappsActor, "webappsActor");