Bug 801951: update social provider manifest and whitelist, r=jaws
authorGavin Sharp <gavin@gavinsharp.com>
Mon, 15 Oct 2012 17:27:48 -0700
changeset 110523 b1bbedc3d30e2959975068fb375503bd0a0187cb
parent 110522 5e6a5958322a8bac50f9cf2419b51fdf6fdedc63
child 110524 610908ff1d38979e4d95765cfb5b25353ab2a95e
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersjaws
bugs801951
milestone19.0a1
Bug 801951: update social provider manifest and whitelist, r=jaws
browser/app/profile/firefox.js
browser/base/content/social-icon.png
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1167,17 +1167,17 @@ pref("pdfjs.previousHandler.preferredAct
 pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
 
 // The maximum amount of decoded image data we'll willingly keep around (we
 // might keep around more than this, but we'll try to get down to this value).
 // (This is intentionally on the high side; see bug 746055.)
 pref("image.mem.max_decoded_image_kb", 256000);
 
 // Example social provider
-pref("social.manifest.motown", "{\"origin\":\"https://motown-dev.mozillalabs.com\",\"name\":\"MoTown\",\"workerURL\":\"https://motown-dev.mozillalabs.com/social/worker.js\",\"iconURL\":\"https://motown-dev.mozillalabs.com/images/motown-icon.png\",\"sidebarURL\":\"https://motown-dev.mozillalabs.com/social/sidebar\"}");
+pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
 // Comma-separated list of nsIURI::prePaths that are allowed to activate
 // built-in social functionality.
-pref("social.activation.whitelist", "https://motown-dev.mozillalabs.com");
+pref("social.activation.whitelist", "https://www.facebook.com");
 pref("social.sidebar.open", true);
 pref("social.active", false);
 pref("social.toast-notifications.enabled", true);
 
 pref("dom.identity.enabled", false);
index 37e54a1e9a0637be9a078eb4e51465eb609a3174..e0e575a812b1734cc83c21875229c57628cd15ed
GIT binary patch
literal 2718
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
Y16U66*5))iEdT%j07*qoM6N<$f@&ch82|tP