Bug 1160101 - Revert browser.eme.ui.enabled pref change from Bug 1160101. r/a=backout
authorChris Pearce <cpearce@mozilla.com>
Fri, 05 Jun 2015 14:17:58 +1200
changeset 266193 51f5d060b146
parent 266192 263f9318751a
child 266194 f5030585d5c0
push id4782
push usercpearce@mozilla.com
push date2015-06-05 02:19 +0000
treeherdermozilla-beta@51f5d060b146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1160101
milestone39.0
Bug 1160101 - Revert browser.eme.ui.enabled pref change from Bug 1160101. r/a=backout
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1835,19 +1835,19 @@ pref("identity.fxaccounts.migrateToDevEd
 // On GTK, we now default to showing the menubar only when alt is pressed:
 #ifdef MOZ_WIDGET_GTK
 pref("ui.key.menuAccessKeyFocuses", true);
 #endif
 
 // Encrypted media extensions.
 pref("media.eme.enabled", true);
 pref("media.eme.apiVisible", true);
-pref("browser.eme.ui.enabled", true);
 
 #ifdef MOZ_ADOBE_EME
+pref("browser.eme.ui.enabled", true);
 pref("media.gmp-eme-adobe.enabled", true);
 #endif
 
 // Play with different values of the decay time and get telemetry,
 // 0 means to randomize (and persist) the experiment value in users' profiles,
 // -1 means no experiment is run and we use the preferred value for frecency (6h)
 pref("browser.cache.frecency_experiment", 0);