author | Ed Morley <emorley@mozilla.com> |
Tue, 28 Jan 2014 16:09:22 +0000 | |
changeset 165576 | bd1aa4c7fbb5157fb209c7918debbe85e8744192 |
parent 165575 | cbc8854278fbfeb9cf0f3f5603c9da38e384ffae |
child 165577 | e24712ca61f0d76a05ee1531dd454aaae3c57261 |
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) |
bugs | 957229 |
milestone | 29.0a1 |
backs out | a4f31914bb0c51050e98a914225db7f4ceba7caf |
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,26 +16,16 @@ 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);