diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-13 09:50:54 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-13 09:50:54 +0100 |
| commit | 4c431486433428b18610c3578b693f3e1f1136eb (patch) | |
| tree | 671b9cb9dc4c1abb5cd3525ca35beff2c762fc66 /application | |
| parent | bf0413359245579e9509146d42cd5547e35da695 (diff) | |
| download | UXP-4c431486433428b18610c3578b693f3e1f1136eb.tar UXP-4c431486433428b18610c3578b693f3e1f1136eb.tar.gz UXP-4c431486433428b18610c3578b693f3e1f1136eb.tar.lz UXP-4c431486433428b18610c3578b693f3e1f1136eb.tar.xz UXP-4c431486433428b18610c3578b693f3e1f1136eb.zip | |
Remove CloudSync
Tag #812
Diffstat (limited to 'application')
| -rw-r--r-- | application/basilisk/base/content/browser-syncui.js | 11 | ||||
| -rw-r--r-- | application/basilisk/base/content/sync/aboutSyncTabs.js | 14 | ||||
| -rw-r--r-- | application/palemoon/configure.in | 4 |
3 files changed, 0 insertions, 29 deletions
diff --git a/application/basilisk/base/content/browser-syncui.js b/application/basilisk/base/content/browser-syncui.js index 3a57140f2..000c8f7b4 100644 --- a/application/basilisk/base/content/browser-syncui.js +++ b/application/basilisk/base/content/browser-syncui.js @@ -4,11 +4,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -#ifdef MOZ_SERVICES_CLOUDSYNC -XPCOMUtils.defineLazyModuleGetter(this, "CloudSync", - "resource://gre/modules/CloudSync.jsm"); -#endif - XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", "resource://gre/modules/FxAccounts.jsm"); @@ -171,13 +166,7 @@ var gSyncUI = { document.getElementById("sync-setup-state").hidden = true; document.getElementById("sync-syncnow-state").hidden = true; -#ifdef MOZ_SERVICES_CLOUDSYNC - if (CloudSync && CloudSync.ready && CloudSync().adapters.count) { - document.getElementById("sync-syncnow-state").hidden = false; - } else if (loginFailed) { -#else if (loginFailed) { -#endif // unhiding this element makes the menubar show the login failure state. document.getElementById("sync-reauth-state").hidden = false; } else if (needsSetup) { diff --git a/application/basilisk/base/content/sync/aboutSyncTabs.js b/application/basilisk/base/content/sync/aboutSyncTabs.js index f4bb607ea..08986f73f 100644 --- a/application/basilisk/base/content/sync/aboutSyncTabs.js +++ b/application/basilisk/base/content/sync/aboutSyncTabs.js @@ -14,11 +14,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Promise", "resource://gre/modules/Promise.jsm"); -#ifdef MOZ_SERVICES_CLOUDSYNC -XPCOMUtils.defineLazyModuleGetter(this, "CloudSync", - "resource://gre/modules/CloudSync.jsm"); -#endif - var RemoteTabViewer = { _tabsList: null, @@ -183,16 +178,7 @@ var RemoteTabViewer = { } } -#ifdef MOZ_SERVICES_CLOUDSYNC - if (CloudSync && CloudSync.ready && CloudSync().tabsReady && CloudSync().tabs.hasRemoteTabs()) { - this._generateCloudSyncTabList() - .then(complete, complete); - } else { - complete(); - } -#else complete(); -#endif }, _clearTabList: function () { diff --git a/application/palemoon/configure.in b/application/palemoon/configure.in index 96f63781e..eb02af3c0 100644 --- a/application/palemoon/configure.in +++ b/application/palemoon/configure.in @@ -36,7 +36,3 @@ MOZ_ARG_DISABLE_BOOL(sync, MOZ_SERVICES_SYNC=, MOZ_SERVICES_SYNC=1) -if test -z "$MOZ_SERVICES_SYNC"; then - MOZ_SERVICES_CLOUDSYNC= -fi - |