wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1040937 - Fix GMPInstallManager and OpenH264Provider using different pref names r=Unfocused a=kwierso

Browse Source
This commit is contained in:
Georg Fritzsche 2014-07-19 02:23:47 +02:00
parent 0184c869d0
commit ec86acbb00
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/app/profile/firefox.js
View File

@ -1653,4 +1653,4 @@ pref("experiments.manifest.certs.1.issuerName", "CN=Cybertrust Public SureServer
pref("experiments.supported", true);
// Enable the OpenH264 plugin support in the addon manager.
pref("media.openh264.providerEnabled", true);
pref("media.gmp-gmpopenh264.providerEnabled", true);

4
toolkit/mozapps/extensions/internal/OpenH264Provider.jsm
View File

@ -19,8 +19,8 @@ Cu.import("resource://gre/modules/osfile.jsm");
const URI_EXTENSION_STRINGS = "chrome://mozapps/locale/extensions/extensions.properties";
const STRING_TYPE_NAME = "type.%ID%.name";
const OPENH264_PLUGIN_ID = "openh264-plugin@cisco.com";
const OPENH264_PREF_BRANCH = "media.openh264.";
const OPENH264_PLUGIN_ID = "gmp-gmpopenh264";
const OPENH264_PREF_BRANCH = "media." + OPENH264_PLUGIN_ID + ".";
const OPENH264_PREF_ENABLED = "enabled";
const OPENH264_PREF_PATH = "path";
const OPENH264_PREF_VERSION = "version";

4
toolkit/mozapps/extensions/test/browser/browser_openH264.js
View File

@ -4,8 +4,8 @@
let {AddonTestUtils} = Components.utils.import("resource://testing-common/AddonManagerTesting.jsm", {});
const OPENH264_PLUGIN_ID = "openh264-plugin@cisco.com";
const OPENH264_PREF_BRANCH = "media.openh264.";
const OPENH264_PLUGIN_ID = "gmp-gmpopenh264";
const OPENH264_PREF_BRANCH = "media." + OPENH264_PLUGIN_ID + ".";
const OPENH264_PREF_ENABLED = OPENH264_PREF_BRANCH + "enabled";
const OPENH264_PREF_PATH = OPENH264_PREF_BRANCH + "path";
const OPENH264_PREF_VERSION = OPENH264_PREF_BRANCH + "version";

2
toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js
View File

@ -102,7 +102,7 @@ var gPluginIDs = [null, null, null, null, null];
function run_test() {
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
Services.prefs.setBoolPref("media.openh264.providerEnabled", false);
Services.prefs.setBoolPref("media.gmp-gmpopenh264.providerEnabled", false);
startupManager();

4
toolkit/mozapps/extensions/test/xpcshell/test_openh264.js
View File

@ -5,8 +5,8 @@
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
const OPENH264_PLUGIN_ID = "openh264-plugin@cisco.com";
const OPENH264_PREF_BRANCH = "media.openh264.";
const OPENH264_PLUGIN_ID = "gmp-gmpopenh264";
const OPENH264_PREF_BRANCH = "media." + OPENH264_PLUGIN_ID + ".";
const OPENH264_PREF_ENABLED = OPENH264_PREF_BRANCH + "enabled";
const OPENH264_PREF_PATH = OPENH264_PREF_BRANCH + "path";
const OPENH264_PREF_VERSION = OPENH264_PREF_BRANCH + "version";

2
toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js
View File

@ -67,7 +67,7 @@ function run_test() {
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
Services.prefs.setBoolPref("media.openh264.providerEnabled", false);
Services.prefs.setBoolPref("media.gmp-gmpopenh264.providerEnabled", false);
startupManager();
AddonManager.addAddonListener(AddonListener);