metadata.edge - Issue 29365879: Issue 4616 - Push Edge related changes to the edge bookmark of adblockpluschrome

Delta Between Two Patch Sets: metadata.edge

Issue 29365879: Issue 4616 - Push Edge related changes to the edge bookmark of adblockpluschrome (Closed)

Left Patch Set: Make sure the package actually works correctly Created Dec. 7, 2016, 11:42 p.m.

Right Patch Set: Hardcode the version number for Edge Created Dec. 19, 2016, 2:46 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 [default]	1 [default]

2 inherit = metadata.common	2 inherit = metadata.chrome

3	3

4 [general]	4 [general]

	5 version = 0.9.10.0

5 basename = adblockplusedge	6 basename = adblockplusedge

6 app_id = EyeoGmbH.AdblockPlus	7 app_id = EyeoGmbH.AdblockPlus

7 publisher_id = CN=4F066043-8AFE-41C9-B762-6C15E77E3F88	8 publisher_id = CN=4F066043-8AFE-41C9-B762-6C15E77E3F88

8 permissions = tabs

9 http:///

10 https:///

11 contextMenus

12 webRequest

13 webRequestBlocking

14 webNavigation

15 storage

16 unlimitedStorage

17 notifications

18 options = options.html

19 background_color = red	9 background_color = red

20 browserAction = icons/abp-16.png icons/abp-19.png icons/abp-20.png icons/abp-32. png icons/abp-38.png icons/abp-40.png popup.html

21 icons = icons/abp-16.png icons/abp-32.png icons/detailed/abp-48.png

22 icons/detailed/abp-64.png icons/detailed/abp-128.png

23	10

24 [compat]	11 [compat]

25 edge = 37.14332.1000.0	12 edge = 37.14332.1000.0

26 windows = 10.0.14332.0/12.0.0.0	13 windows = 10.0.14332.0/12.0.0.0

27	14

28 [mapping]

29 icons/abp-16.png = chrome/icons/abp-16.png
kzar 2016/12/08 12:37:31 I'm guessing you copied most of this from metadata I'm guessing you copied most of this from metadata.chrome? If so perhaps it would make more sense to inherit that file instead of metadata.common here? Oleksandr 2016/12/09 06:43:00 Main reason I did not inherit from metadata.chrome Show quoted text On 2016/12/08 12:37:31, kzar wrote: > I'm guessing you copied most of this from metadata.chrome? If so perhaps it > would make more sense to inherit that file instead of metadata.common here? Main reason I did not inherit from metadata.chrome is because we don't need the devtools stuff in Edge. kzar 2016/12/12 12:12:11 Fair enough, I guess duplicating it doesn't matter Show quoted text On 2016/12/09 06:43:00, Oleksandr wrote: > On 2016/12/08 12:37:31, kzar wrote: > > I'm guessing you copied most of this from metadata.chrome? If so perhaps it > > would make more sense to inherit that file instead of metadata.common here? > > Main reason I did not inherit from metadata.chrome is because we don't need the > devtools stuff in Edge. Fair enough, I guess duplicating it doesn't matter too much for now. (When we're ready to merge Edge into master we might reconsider, perhaps some of these should live in metadata.common or another common metadata file.)
30 icons/abp-16-whitelisted.png = chrome/icons/abp-16-whitelisted.png

31 icons/abp-16-notification-critical.png = chrome/icons/abp-16-notification-critic al.png

32 icons/abp-16-notification-information.png = chrome/icons/abp-16-notification-inf ormation.png

33 icons/abp-19.png = chrome/icons/abp-19.png

34 icons/abp-19-whitelisted.png = chrome/icons/abp-19-whitelisted.png

35 icons/abp-19-notification-critical.png = chrome/icons/abp-19-notification-critic al.png

36 icons/abp-19-notification-information.png = chrome/icons/abp-19-notification-inf ormation.png

37 icons/abp-20.png = chrome/icons/abp-20.png

38 icons/abp-20-whitelisted.png = chrome/icons/abp-20-whitelisted.png

39 icons/abp-20-notification-critical.png = chrome/icons/abp-20-notification-critic al.png

40 icons/abp-20-notification-information.png = chrome/icons/abp-20-notification-inf ormation.png

41 icons/abp-32.png = chrome/icons/abp-32.png

42 icons/abp-32-whitelisted.png = chrome/icons/abp-32-whitelisted.png

43 icons/abp-32-notification-critical.png = chrome/icons/abp-32-notification-critic al.png

44 icons/abp-32-notification-information.png = chrome/icons/abp-32-notification-inf ormation.png

45 icons/abp-38.png = chrome/icons/abp-38.png

46 icons/abp-38-whitelisted.png = chrome/icons/abp-38-whitelisted.png

47 icons/abp-38-notification-critical.png = chrome/icons/abp-38-notification-critic al.png

48 icons/abp-38-notification-information.png = chrome/icons/abp-38-notification-inf ormation.png

49 icons/abp-40.png = chrome/icons/abp-40.png

50 icons/abp-40-whitelisted.png = chrome/icons/abp-40-whitelisted.png

51 icons/abp-40-notification-critical.png = chrome/icons/abp-40-notification-critic al.png

52 icons/abp-40-notification-information.png = chrome/icons/abp-40-notification-inf ormation.png

53 icons/detailed/abp-48.png = chrome/icons/detailed/abp-48.png

54

55 [appx_assets]	15 [appx_assets]

56 logo_44.png = icons/abp-44.png	16 logo_44.png = icons/abp-44.png

57 logo_50.png = icons/abp-50.png	17 logo_50.png = icons/abp-50.png

58 logo_150.png = icons/abp-150.png	18 logo_150.png = icons/abp-150.png

59

60 [convert_js]

61 lib/adblockplus.js += lib/popupBlocker.js lib/uninstall.js lib/csp.js

62 ext/common.js += chrome/ext/common.js

63 ext/background.js += chrome/ext/background.js

LEFT	RIGHT