wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 978876 - Part 2: refactor out datatype choice. r=markh

Browse Source
This commit is contained in:
Richard Newman 2014-03-13 16:37:26 -07:00
parent 152a9cbecb
commit 725812ee96
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
services/sync/modules/browserid_identity.js
View File

@ -162,6 +162,19 @@ this.BrowserIDManager.prototype = {
return Promise.resolve();
},
offerSyncOptions: function () {
// If the user chose to "Customize sync options" when signing
// up with Firefox Accounts, ask them to choose what to sync.
const url = "chrome://browser/content/sync/customize.xul";
const features = "centerscreen,chrome,modal,dialog,resizable=no";
let win = Services.wm.getMostRecentWindow("navigator:browser");
let data = {accepted: false};
win.openDialog(url, "_blank", features, data);
return data;
},
initializeWithCurrentIdentity: function(isInitialSync=false) {
// While this function returns a promise that resolves once we've started
// the auth process, that process is complete when
@ -193,15 +206,7 @@ this.BrowserIDManager.prototype = {
this._updateSignedInUser(accountData);
this._log.info("Starting fetch for key bundle.");
if (this.needsCustomization) {
// If the user chose to "Customize sync options" when signing
// up with Firefox Accounts, ask them to choose what to sync.
const url = "chrome://browser/content/sync/customize.xul";
const features = "centerscreen,chrome,modal,dialog,resizable=no";
let win = Services.wm.getMostRecentWindow("navigator:browser");
let data = {accepted: false};
win.openDialog(url, "_blank", features, data);
let data = this.offerSyncOptions();
if (data.accepted) {
Services.prefs.clearUserPref(PREF_SYNC_SHOW_CUSTOMIZATION);
} else {

3
services/sync/modules/identity.js
View File

@ -556,6 +556,7 @@ IdentityManager.prototype = {
},
offerSyncOptions: function () {
// TODO
// Do nothing for Sync 1.1.
return {accepted: true};
},
};