Bug 1072181 part 3 - New Aurora channel prefs r=paul

--HG--
extra : rebase_source : 9998025d99157cb150e87a47e18fe145b38ecbc2

browser/app/profile/firefox.js

@@ -1148,7 +1148,12 @@ pref("toolkit.crashreporter.infoURL",
 pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
 
 // base url for web-based feedback pages
+#ifdef MOZ_DEV_EDITION
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+#else
 pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/");
+#endif
+
 
 // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
 pref("security.alternate_certificate_error_page", "certerror");
@@ -1382,7 +1387,11 @@ pref("devtools.debugger.ui.variables-searchbox-visible", false);
 
 // Enable the Profiler and the Timeline
 pref("devtools.profiler.enabled", true);
+#ifdef MOZ_DEV_EDITION
+pref("devtools.timeline.enabled", true);
+#else
 pref("devtools.timeline.enabled", false);
+#endif
 
 // Enable perftools via build command
 #ifdef MOZ_DEVTOOLS_PERFTOOLS

browser/devtools/webide/webide-prefs.js

@@ -6,7 +6,11 @@
 pref("devtools.webide.showProjectEditor", true);
 pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json");
 pref("devtools.webide.autoinstallADBHelper", true);
+#ifdef MOZ_DEV_EDITION
+pref("devtools.webide.autoinstallFxdtAdapters", true);
+#else
 pref("devtools.webide.autoinstallFxdtAdapters", false);
+#endif
 pref("devtools.webide.restoreLastProject", true);
 pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json");
 pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi");
@@ -19,5 +23,10 @@ pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000");
 pref("devtools.webide.lastConnectedRuntime", "");
 pref("devtools.webide.lastSelectedProject", "");
 pref("devtools.webide.widget.autoinstall", true);
+#ifdef MOZ_DEV_EDITION
+pref("devtools.webide.widget.enabled", true);
+pref("devtools.webide.widget.inNavbarByDefault", true);
+#else
 pref("devtools.webide.widget.enabled", false);
 pref("devtools.webide.widget.inNavbarByDefault", false);
+#endif