Fix Chrome prefetch main_frame & outermost_frame

Makefile

@@ -1,21 +1,32 @@
 BUILDDIR := build/
-NAME     := ipvfoo
-VERSION  := $(shell cat src/manifest.json | \
-              sed -n 's/^ *"version": *"\([0-9.]\+\)".*/\1/p' | \
-              head -n1)
+NAME := ipvfoo
+MANIFEST := src/manifest.json
+MANIFEST_F := src/manifest/firefox-manifest.json
+MANIFEST_C := src/manifest/chrome-manifest.json
+VERSION_F := $(shell cat ${MANIFEST_F} | \
+	sed -n 's/^ *"version": *"\([0-9.]\+\)".*/\1/p' | \
+	head -n1)
+VERSION_C := $(shell cat ${MANIFEST_C} | \
+	sed -n 's/^ *"version": *"\([0-9.]\+\)".*/\1/p' | \
+	head -n1)
 
 all: prepare firefox chrome
 
 prepare:
+	@diff ${MANIFEST} ${MANIFEST_F} >/dev/null || \
+		diff ${MANIFEST} ${MANIFEST_C} >/dev/null || \
+		(echo "${MANIFEST} is not a copy of ${MANIFEST_F} or ${MANIFEST_C}; aborting."; exit 1)
 	mkdir -p build
 
 firefox: prepare
-	rm -f ${BUILDDIR}${NAME}-${VERSION}.xpi
-	cd src && zip -9r ../${BUILDDIR}${NAME}-${VERSION}.xpi *
+	rm -f ${BUILDDIR}${NAME}-${VERSION_F}.xpi
+	cp -f ${MANIFEST_F} ${MANIFEST}
+	zip -9j ${BUILDDIR}${NAME}-${VERSION_F}.xpi -j src/*
 
 chrome: prepare
-	rm -f ${BUILDDIR}${NAME}-${VERSION}.zip
-	zip -9r ${BUILDDIR}${NAME}-${VERSION}.zip src
+	rm -f ${BUILDDIR}${NAME}-${VERSION_C}.zip
+	cp -f ${MANIFEST_C} ${MANIFEST}
+	zip -9j ${BUILDDIR}${NAME}-${VERSION_C}.zip -j src/*
 
 clean:
 	rm -rf ${BUILDDIR}

README.md

@@ -1,12 +1,49 @@
-IPvFoo is a Chrome extension that adds an icon to your location bar, indicating whether the current page was fetched using IPv4 or IPv6. When you click the icon, a pop-up appears, listing the IP address for each domain that served the page elements.
+**IPvFoo** is a Chrome/Firefox extension that adds an icon to indicate whether the current page was fetched using IPv4 or IPv6. When you click the icon, a pop-up appears, listing the IP address for each domain that served the page elements.
 
-Everything is captured privately using the webRequest API (new in Chrome 17), without creating any additional network traffic.
+Everything is captured privately using the webRequest API, without creating any additional network traffic.
 
-#### Install it from the Chrome Web Store:
-https://chrome.google.com/webstore/detail/ecanpcehffngcegjmadlcijfolapggal
+## Screenshots
+![Screenshot](/misc/screenshot_webstore_1_640x400.png?raw=true)
 
-#### Screenshot:
-![Screenshot](/misc/screenshot_webstore_640x400.png?raw=true)
+![Screenshot](/misc/screenshot_options.png?raw=true)
 
-#### Firefox Support:
-IPvFoo now [runs on Firefox](https://addons.mozilla.org/en-US/firefox/addon/ipvfoo-pmarks/), but there are [a few bugs](https://github.com/pmarks-net/ipvfoo/issues/32) to work out.
+## Add to Chrome
+https://chrome.google.com/webstore/detail/ipvfoo/ecanpcehffngcegjmadlcijfolapggal
+
+<picture><img src="https://badgen.net/chrome-web-store/v/ecanpcehffngcegjmadlcijfolapggal"></picture>
+<picture><img src="https://badgen.net/chrome-web-store/users/ecanpcehffngcegjmadlcijfolapggal"></picture>
+<picture><img src="https://badgen.net/chrome-web-store/rating/ecanpcehffngcegjmadlcijfolapggal"></picture>
+
+## Add to Firefox
+https://addons.mozilla.org/addon/ipvfoo/  
+
+<picture><img src="https://badgen.net/amo/v/ipvfoo"></picture>
+<picture><img src="https://badgen.net/amo/users/ipvfoo"></picture>
+<picture><img src="https://badgen.net/amo/rating/ipvfoo"></picture>
+
+## Add to Edge
+https://microsoftedge.microsoft.com/addons/detail/ipvfoo/dphnkggpaicipkljebciobedeiaiofod  
+*(You can also run the Chrome version on Edge, as they are identical.)*
+
+## Safari?
+
+IPvFoo cannot be [ported to Safari](https://github.com/pmarks-net/ipvfoo/issues/39) because the `webRequest` API does not report IP addresses.  In theory, a Safari extension could do its own DNS lookups over HTTPS, but such behavior is beyond the scope of IPvFoo.
+
+## Running IPvFoo unpacked from git
+
+IPvFoo shares a common codebase for Chrome and Firefox, but `manifest.json` is browser specific.
+
+Firefox shows this error when running the Chrome version:
+
+> There was an error during the temporary add-on installation.  
+> background.service_worker is currently disabled. Add background.scripts.
+
+Chrome shows this error when running the Firefox version:
+
+> 'background.scripts' requires manifest version of 2 or lower.  
+> 'page_action' requires manifest version of 2 or lower.
+
+The `use_*_manifest.sh.bat` scripts in the [manifest](src/manifest/) directory may be used to switch between versions.
+
+<br><br><br>
+Donate: https://liberapay.com/pmarks

misc/privacy_policy.txt

@@ -1,8 +1,15 @@
 Privacy Policy
 
-IPvFoo monitors all of your web traffic, in order to present a table of
-connection information.  This information is stored in local RAM, and is
-not transmitted over the network.
+IPvFoo has full access to your web traffic, as this is necessary to present
+the table of connection information.  All information is kept in RAM on your
+computer, and never transmitted over the network.
 
-If you use the "Look up on bgp.he.net" feature, the selected domain name
-or IP address will be sent to Hurricane Electric via URL request.
+Technically there is one exception: if you use the "Look up on bgp.he.net"
+feature, your browser will navigate to a URL managed by Hurricane Electric,
+containing the selected domain name or IP address.
+
+
+My other Chrome extensions do not use personal information at all:
+- Incognito Proxy
+- Endless Whisper
+- <pre> Line Wrapper