Commit Graph

2167 Commits

Author SHA1 Message Date
Alessio Placitelli
d19436f3f5 Bug 1134279 - Change Telemetry data producers to use the correct recording flags. r=vladan 2015-03-23 04:39:00 +01:00
Wes Kocher
407619ed84 Merge m-c to fx-team a=merge CLOSED TREE 2015-03-24 18:38:29 -07:00
Wes Kocher
a2b428efea Merge fx-team to m-c a=merge CLOSED TREE 2015-03-24 18:12:58 -07:00
Ryan VanderMeulen
5ca6ac7ada Backed out changeset 37bd20ca096a (bug 1139656) for test_blocklistchange.js xpcshell failures.
CLOSED TREE
2015-03-24 15:36:48 -04:00
Stephen Pohl
c7c87f5d03 Bug 1146565 - Ensure proper CDM install state when the media.eme.enabled pref is toggled when Firefox isn't running. r=mossop 2015-03-24 15:36:19 -04:00
Ryan VanderMeulen
c12adf0b76 Backed out changeset b78aa57b284e (bug 1146565) for test_blocklistchange.js xpcshell failures.
CLOSED TREE
2015-03-24 15:33:21 -04:00
Dão Gottwald
dc5aac6e35 Bug 1139656 - Implement the first pieces of the all-doorhanger install flow for add-ons installed from websites. r=dtownsend 2015-03-24 18:54:59 +01:00
Stephen Pohl
206caa386e Bug 1146565: Ensure proper CDM install state when the media.eme.enabled pref is toggled when Firefox isn't running. r=mossop 2015-03-24 13:04:57 -04:00
Brian Grinstead
892a74f728 Bug 1094821 - Make it possible for an application to load extra themes into LightweightThemeManager.usedThemes;r=Gijs
When calling addBuiltInTheme, theme objects are stored in a Map keyed on ID
and are appended onto the usedThemes array.  These aren't removeable and don't
get stored in the pref.
2015-03-23 15:32:43 -07:00
Brian Grinstead
ac897bf890 Bug 1094821 - Store currently selected lightweight theme in the selectedThemeID pref instead figuring it out based on the order of the usedThemes pref;r=Gijs 2015-03-23 15:32:41 -07:00
Carsten "Tomcat" Book
cfa695b0e3 merge mozilla-inbound to mozilla-central a=merge 2015-03-23 13:18:35 +01:00
Stephen Pohl
148f6e4649 Backout 0e6aa605af74 (bug 1140263) now that Adobe EME is cleared to be turned on for Windows Vista and above. r=me 2015-03-22 23:26:26 -04:00
Ehsan Akhgari
883849ee32 Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
Stephen Pohl
17bef18e85 Bug 1145694: Uninstall Adobe EME when media.eme.enabled is set to false. r=mossop 2015-03-22 23:12:16 -04:00
Stephen Pohl
71ed1fe508 Bug 1145336: Test updates. r=jwwang 2015-03-22 23:12:07 -04:00
Stephen Pohl
d123931436 Bug 1145336: Remove old GMPs during updates. r=jwwang 2015-03-22 23:12:03 -04:00
Dão Gottwald
067fb8ef2f Bug 1139656 - Implement the first pieces of the all-doorhanger install flow for add-ons installed from websites. r=dtownsend
--HG--
extra : rebase_source : 5cb6a4265cbf5f9c10eec53336c2bab1d8ba44ae
2015-03-24 22:24:49 +01:00
Stephen Pohl
b8c729938b Bug 1140263: Disable Adobe EME on all platforms for now. r=cpearce 2015-03-19 22:59:49 -04:00
Stephen Pohl
90c1248342 Bug 1140263: Test updates. r=mossop 2015-03-19 22:59:45 -04:00
Stephen Pohl
9fca7ec964 Bug 1140263: Enable Adobe EME on Windows Vista+ and add a pref to force-enable it on other platforms. r=mossop 2015-03-19 22:59:38 -04:00
Margaret Leibovic
9d06161cb9 Bug 1131004 - Provide a more detailed description for pre-installed OpenH264 add-on. r=gfritzsche
--HG--
extra : rebase_source : 9eb6390b093db42e82ccfdde2327aecc90dfd71d
2015-03-11 11:40:29 -07:00
Stephen Pohl
acfabd9547 Bug 1140523: Send correct onEnabling/onDisabling notifications when EME preferences change. r=mossop 2015-03-16 14:59:08 -04:00
Phil Ringnalda
65c70420b9 Merge m-c to m-i 2015-03-15 19:42:35 -07:00
Sebastian Hengst
394a2dd441 Bug 1143470 - Add BUG_COMPONENT to moz.build files in toolkit and xulrunner. r=gavin 2015-03-15 19:36:24 +01:00
Stephen Pohl
3482b9c71e Bug 1140522: Test updates. r=mossop 2015-03-14 23:25:46 -04:00
Stephen Pohl
66ae1be1fd Bug 1140522: Set proper permissions on GMP when disabled. r=mossop 2015-03-14 23:25:42 -04:00
Stephen Pohl
a71fb21c18 Bug 1140522: Ensure proper use of appDisabled and userDisabled in GMPProvider.jsm. r=mossop 2015-03-14 23:25:38 -04:00
Dave Townsend
55ee944e85 Bug 1068087: Switch about:plugins to run remotely. r=mconley
--HG--
extra : rebase_source : f1538bb9d17cc1a320e0e29c2733a038fcbaefb2
extra : source : 0718dffcd078caef467625cb4bf05753ad5a58e1
2015-01-08 12:40:14 -08:00
Ryan VanderMeulen
6ed1b917e2 Merge m-c to inbound. a=merge
--HG--
rename : browser/devtools/webide/modules/remote-resources.js => browser/devtools/shared/getjson.js
rename : testing/marionette/marionette-common.js => testing/marionette/common.js
rename : testing/marionette/marionette-elements.js => testing/marionette/elements.js
rename : testing/marionette/marionette-frame-manager.js => testing/marionette/frame-manager.js
rename : testing/marionette/marionette-listener.js => testing/marionette/listener.js
rename : testing/marionette/marionette-sendkeys.js => testing/marionette/sendkeys.js
rename : testing/marionette/marionette-simpletest.js => testing/marionette/simpletest.js
extra : rebase_source : 0367967af3ef28a8bfa6bb03ffdb6d229f4d92be
2015-03-24 11:58:07 -04:00
Jim Mathies
ea3c8574a4 Bug 1129040 - Add a blocklist shim in the content process and forward requests to the parent process. r=Mossop
--HG--
extra : rebase_source : 37803cbf174090e817c84ac0390715060c60000b
2015-03-23 08:40:08 -05:00
Stephen Pohl
1d4108ed04 Backout 9000e74fa1fe because it requires test updates. r=me 2015-03-10 20:42:30 -04:00
Stephen Pohl
8a63efcd80 Bug 1140522: Ensure proper use of appDisabled and userDisabled in GMPProvider.jsm. r=mossop 2015-03-10 20:30:58 -04:00
Gijs Kruitbosch
b62606f236 Bug 1129219 - fix learnMoreURL to be a getter so we don't access appInfo really early, rs=bustage-and-Mossop's-advice on a CLOSED TREE
--HG--
extra : amend_source : 939284f33529a355b001d590d44303b77bdc8c1f
2015-03-09 19:43:08 +00:00
Gijs Kruitbosch
7a77d38bb0 Bug 1129219 - add learn more link for EME provider, r=MattN
--HG--
extra : rebase_source : efdf734aeb0fe50c0cfa73f3e15ccc80c571febe
2015-03-09 17:26:15 +00:00
Ryan VanderMeulen
c315668b7b Bug 632290 - Disable browser_about.js on Linux and Windows.
--HG--
extra : rebase_source : d9c0bc991cf23ff7d7f9765886f3100479b90ec9
2015-03-06 09:07:21 -05:00
Benjamin Smedberg
b338c03fbb Trivial, no bug: add missing semicolon to nsBlocklistService.js to avoid a strict warning. 2015-03-04 10:48:04 -05:00
Benjamin Smedberg
0b8c17ae3d Bug 1134615 - Refactor the blocklist matching code in _getPluginBlocklistState into _getPluginBlocklistEntry so that getPluginBlocklistURL and getPluginInfoURL return the correct block entry. r=Mossop
--HG--
extra : rebase_source : ca6e2fe51eb28e8ddd9203d22a57f68096a4b405
extra : amend_source : 62ec06e414a88562bfe1163be2ab8f02602a083e
2015-02-19 13:07:59 -05:00
Anish
4063a569ed Bug 958147 - Choose one of run-if or skip-if and get rid of the other.r=jmaher, mwargers 2015-03-03 08:46:37 -05:00
Stephen Pohl
664f2b4ba6 Bug 1129721: Add license URL for Adobe EME. r=dolske 2015-02-27 14:30:14 -05:00
Stephen Pohl
6a270c04fc Bug 1130682: Add homepage URL for Adobe EME. r=dolske 2015-02-27 14:30:09 -05:00
Georg Fritzsche
eb3ac01fed Bug 1136639 - Disable logging for OS.File activities again in head_addons.js. rs=yoric 2015-02-25 23:54:35 +01:00
Alessio Placitelli
93f8ea689f Bug 1122061 - Move TelemetrySession tests out of test_telemetryPing.js. r=gfritzsche 2015-02-25 23:54:33 +01:00
Alessio Placitelli
376460a8c1 Bug 1122050 - Environment addons data collection test coverage. r=gfritzsche 2015-02-25 23:54:33 +01:00
Robert Strong
cecbc6e4fb Bug 897031 - NS_ERROR_XPC_GS_RETURNED_FAILURE at nsBlocklistService.js:70 followed by ReferenceError: gApp is not defined, on green Windows debug mochitest runs. r=dtownsend 2015-02-24 14:11:33 -08:00
Benjamin Smedberg
d4201803b0 Bug 1133000 - Expose the protected-mode toggle in the Addons-manager UI options pane for Flash. r=Unfocused/MattN
--HG--
extra : rebase_source : 6917fdbc19c7b2a03d3a65c1f2d7eff01afc61fd
extra : histedit_source : bcb328b11de86da2e7d84b8b1d730a43e5d515db
2015-02-13 14:55:37 -05:00
Stephen Pohl
aabcb485ce Bug 1135242: Properly initialize media.eme.enabled during GMP tests, irrespective of the default. r=gfritzsche 2015-02-21 11:26:35 -05:00
Stephen Pohl
98e9e66c09 Bug 1134831: Add the ability to localize license info for GMPs in addons manager. r=gfritzsche 2015-02-20 08:26:29 -05:00
Stephen Pohl
ebe2268f1e Bug 1134817: Change GreBinD to GreD for ClearKey (followup to bug 1132789). r=cpearce 2015-02-20 08:26:22 -05:00
Chris Peterson
645f8904ac Bug 1133279 - Remove nonstandard let blocks from toolkit/mozapps/extensions. r=Mossop 2015-02-05 22:54:56 -08:00
Hector Zhao
910a54cd6d Bug 1129287 - Fix not rejecting partial name matches for plugin blocklist entries. r=gfritzsche 2015-02-04 12:27:54 +08:00