Bug 942756 - Unify debugger server startup: remove the temporary check to start-debugger-server in b2g desktop. r=fabrice
☠☠ backed out by bd55f7f8b48c ☠ ☠
authorPaul Rouget <paul@mozilla.com>
Tue, 22 Apr 2014 10:51:00 -0400
changeset 199675 d234447173a8b4fbfc94f2215c1c73613b0ed636
parent 199674 f7b85c252914c7b0855fff96262b48965f943f52
child 199676 eb385c85d88b160fcc7cbb9e0b1ef9c5d931ce31
push id486
push userasasaki@mozilla.com
push dateMon, 14 Jul 2014 18:39:42 +0000
treeherdermozilla-release@d33428174ff1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs942756
milestone31.0a1
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
Bug 942756 - Unify debugger server startup: remove the temporary check to start-debugger-server in b2g desktop. r=fabrice
b2g/chrome/content/desktop.js
--- a/b2g/chrome/content/desktop.js
+++ b/b2g/chrome/content/desktop.js
@@ -41,39 +41,12 @@ function setupButtons() {
     rotateButton.classList.add('active');
   });
   rotateButton.addEventListener('touchend', function() {
     GlobalSimulatorScreen.flipScreen();
     rotateButton.classList.remove('active');
   });
 }
 
-function checkDebuggerPort() {
-  // XXX: To be removed once bug 942756 lands.
-  // We are hacking 'unix-domain-socket' pref by setting a tcp port (number).
-  // DebuggerServer.openListener detects that it isn't a file path (string),
-  // and starts listening on the tcp port given here as command line argument.
-
-  if (!window.arguments) {
-    return;
-  }
-
-  // Get the command line arguments that were passed to the b2g client
-  let args = window.arguments[0].QueryInterface(Ci.nsICommandLine);
-
-  let dbgport;
-  try {
-    dbgport = args.handleFlagWithParam('start-debugger-server', false);
-  } catch(e) {}
-
-  if (dbgport) {
-    dump('Opening debugger server on ' + dbgport + '\n');
-    Services.prefs.setCharPref('devtools.debugger.unix-domain-socket', dbgport);
-    navigator.mozSettings.createLock().set(
-      {'debugger.remote-mode': 'adb-devtools'});
-  }
-}
-
 window.addEventListener('ContentStart', function() {
   enableTouch();
   setupButtons();
-  checkDebuggerPort();
 });