Issue 5803 - Integrate new options page into adblockpluschrome

metadata.gecko-webext

Index: metadata.gecko-webext
===================================================================
--- a/metadata.gecko-webext
+++ b/metadata.gecko-webext
@@ -12,14 +12,36 @@
 [mapping]

[saroyanm, 2017/10/05 21:56:58]

Note: On the time of creation of this review the subscriptions.xml were not
updated yet.

So currently the EasyPrivacy and fanboy-social are not visible in Privacy and
Security section on General tab.

As soon it's updated I'll update dependencies accordingly.

[saroyanm, 2017/10/06 20:41:20]

Subscriptions.xml in the adblockpluscore are updated.
Dependencies are updated accordingly.

 mobile-options.html = adblockplusui/mobile-options.html
 mobile-options.js = adblockplusui/mobile-options.js
+options.html = adblockplusui/options.html

[saroyanm, 2017/10/05 21:56:58]

As far as I understood, the iframe issue is only relevant to the android mobile.

So seems like we are safe overriding options.html, Rather than pointing
everything to desktop-options.* ?

[Sebastian Noack, 2017/10/05 22:12:34]

But then it is also overridden on Android. We use the same build for Firefox on
desktop and Firefox Mobile. Otherwise, the iframe workaround wouldn't be
necessary in the first place.

[saroyanm, 2017/10/05 22:37:57]

Noted: -> https://codereview.adblockplus.org/29565861/

[Thomas Greiner, 2017/10/06 12:16:55]

This is not the issue because we could still map it as

  desktop-options.html = adblockplusui/options.html
  skin/options.css = adblockplusui/options.css

which is why we went forward with renaming it from new-options.html to
options.html in the first place.

However, there seems to be one collision we can't avoid with the mapping which
is options.js since both adblockpluschrome/options.html as well as
adblockplusui/options.html refer to it. Therefore the rename to
desktop-options.html will be necessary after all, unfortunately.

[saroyanm, 2017/10/06 16:58:28]

Acknowledged.

[saroyanm, 2017/10/06 20:41:20]

Done.

+options.js = adblockplusui/options.js
+skin/options.css = adblockplusui/skin/options.css
 skin/abp-logo.svg = adblockplusui/skin/abp-logo.svg
 skin/mobile-options.css = adblockplusui/skin/mobile-options.css
 skin/mobile/checkmark.svg = adblockplusui/skin/mobile/checkmark.svg
 skin/mobile/toggle.svg = adblockplusui/skin/mobile/toggle.svg
 skin/mobile/trash.svg = adblockplusui/skin/mobile/trash.svg
+skin/icons/tooltip.svg = adblockplusui/skin/icons/tooltip.svg
+skin/icons/gear.svg = adblockplusui/skin/icons/gear.svg
+skin/icons/toggle.svg = adblockplusui/skin/icons/toggle.svg
+skin/icons/reload.svg = adblockplusui/skin/icons/reload.svg
+skin/icons/globe.svg = adblockplusui/skin/icons/globe.svg
+skin/icons/code.svg = adblockplusui/skin/icons/code.svg
+skin/icons/trash.svg = adblockplusui/skin/icons/trash.svg
+skin/icons/delete.svg = adblockplusui/skin/icons/delete.svg
+skin/icons/attention.svg = adblockplusui/skin/icons/attention.svg
+skin/icons/checkmark.svg = adblockplusui/skin/icons/checkmark.svg
+skin/icons/checkbox.png = adblockplusui/skin/icons/checkbox.png
+skin/social/twitter.svg = adblockplusui/skin/social/twitter.svg
+skin/social/facebook.svg = adblockplusui/skin/social/facebook.svg
+skin/social/googleplus.svg = adblockplusui/skin/social/googleplus.svg
+skin/fonts/SourceSansPro-Regular.woff = adblockplusui/skin/fonts/SourceSansPro-Regular.woff
+skin/fonts/SourceSansPro-Light.woff = adblockplusui/skin/fonts/SourceSansPro-Light.woff
+skin/fonts/SourceSansPro-bold.woff = adblockplusui/skin/fonts/SourceSansPro-bold.woff
 
 [convert_js]
 lib/adblockplus.js += lib/firefoxDataCleanup.js
 
 [import_locales]
 adblockplusui/locale/*/mobile-options.json = =*
+adblockplusui/locale/*/options.json = =*
+adblockplusui/locale/*/common.json = =*