☠☠ backed out by bd1aa4c7fbb5 ☠ ☠ | |
author | Tim Taubert <ttaubert@mozilla.com> |
Mon, 27 Jan 2014 15:17:29 -0800 | |
changeset 165563 | a4f31914bb0c51050e98a914225db7f4ceba7caf |
parent 165562 | 158bd11e115729c44259cf063b5f002aa9d79018 |
child 165564 | 224fceb749a2a539580c7442474035f86730934b |
push id | 26097 |
push user | ryanvm@gmail.com |
push date | Tue, 28 Jan 2014 21:18:27 +0000 |
treeherder | mozilla-central@128c86a925d7 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | markh |
bugs | 957229 |
milestone | 29.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/base/content/aboutaccounts/aboutaccounts.js +++ b/browser/base/content/aboutaccounts/aboutaccounts.js @@ -16,16 +16,26 @@ function log(msg) { function error(msg) { console.log("Firefox Account Error: " + msg + "\n"); }; let wrapper = { iframe: null, init: function () { + let weave = Cc["@mozilla.org/weave/service;1"] + .getService(Ci.nsISupports) + .wrappedJSObject; + + // Don't show about:accounts with FxA disabled. + if (!weave.fxAccountsEnabled) { + document.body.remove(); + return; + } + let iframe = document.getElementById("remote"); this.iframe = iframe; iframe.addEventListener("load", this); try { iframe.src = fxAccounts.getAccountsURI(); } catch (e) { error("Couldn't init Firefox Account wrapper: " + e.message);