Merge mozilla-central to mozilla-inbound
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 06 Jul 2015 11:45:03 +0200
changeset 275862 8a02b5e8f72caf95e0ec5be5da59fa4de1893bba
parent 275861 a04ce0f96418ca00fb37974bf7d58fefee9d930b (current diff)
parent 275788 cef11c3e86c3ab51adcb2a6c341d4a9864e63aff (diff)
child 275863 9dbcee65bcee2c7c1726cb454eab49881f5b5de3
push id3246
push usergijskruitbosch@gmail.com
push dateTue, 07 Jul 2015 09:06:38 +0000
milestone42.0a1
Merge mozilla-central to mozilla-inbound
--- a/mobile/android/components/BrowserCLH.js
+++ b/mobile/android/components/BrowserCLH.js
@@ -88,17 +88,21 @@ BrowserCLH.prototype = {
       } else {
         let args = {
           url: openURL,
           width: width,
           height: height,
         };
 
         let flags = "chrome,dialog=no,all";
-        browserWin = openWindow(null, "chrome://browser/content/browser.xul", "_blank", flags, args);
+        let chromeURL = "chrome://browser/content/browser.xul";
+        try {
+          chromeURL = Services.prefs.getCharPref("toolkit.defaultChromeURI");
+        } catch(e) {}
+        browserWin = openWindow(null, chromeURL, "_blank", flags, args);
       }
 
       aCmdLine.preventDefault = true;
     } catch (x) {
       dump("BrowserCLH.handle: " + x);
     }
   },
 
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -56,16 +56,17 @@ LOCAL_INCLUDES += [
     '../build',
     '/caps',
     '/toolkit/crashreporter/google-breakpad/src',
     '/tools/profiler',
 ]
 
 # BHR disabled for Release builds because of bug 965392.
 # BHR disabled for debug builds because of bug 979069.
-if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and not CONFIG['MOZ_DEBUG']:
+# BHR disabled on gonk because of bug 1180533
+if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and not CONFIG['MOZ_DEBUG'] and not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')