Skip to content

Commit db9a40c

Browse files
committed
Bug 1238079 - remove the desktop web runtime; r=fabrice,mossop,gps,jryans,jmaher,marco
1 parent f5fe05f commit db9a40c

File tree

232 files changed

+21
-14393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+21
-14393
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ testing/**
4444
tools/**
4545
uriloader/**
4646
view/**
47-
webapprt/**
4847
widget/**
4948
xpcom/**
5049
xpfe/**

b2g/dev/app.mozbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ if CONFIG['MOZ_EXTENSIONS']:
1010

1111
DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
1212

13-
if CONFIG['MOZ_WEBAPP_RUNTIME']:
14-
DIRS += ['/webapprt']
15-
1613
DIRS += [
1714
'/b2g/chrome',
1815
'/b2g/components',

browser/app.mozbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ if CONFIG['MOZ_EXTENSIONS']:
1010

1111
DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
1212

13-
if CONFIG['MOZ_WEBAPP_RUNTIME']:
14-
DIRS += ['/webapprt']
15-
1613
# Never add dirs after browser because they apparently won't get
1714
# packaged properly on Mac.
1815
DIRS += ['/browser']

browser/base/content/browser.xul

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,6 @@
678678
aria-label="&urlbar.loginFillNotificationAnchor.label;"/>
679679
<image id="password-notification-icon" class="notification-anchor-icon" role="button"
680680
aria-label="&urlbar.passwordNotificationAnchor.label;"/>
681-
<image id="webapps-notification-icon" class="notification-anchor-icon" role="button"
682-
aria-label="&urlbar.webappsNotificationAnchor.label;"/>
683681
<image id="plugins-notification-icon" class="notification-anchor-icon" role="button"
684682
aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
685683
<image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"

browser/base/content/popup-notifications.inc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
</popupnotificationcontent>
4040
</popupnotification>
4141

42-
<popupnotification id="webapps-install-progress-notification" hidden="true">
43-
<popupnotificationcontent id="webapps-install-progress-content" orient="vertical" align="start"/>
44-
</popupnotification>
45-
4642
<popupnotification id="servicesInstall-notification" hidden="true">
4743
<popupnotificationcontent orient="vertical" align="start">
4844
<!-- XXX bug 974146, tests are looking for this, can't remove yet. -->

browser/components/nsBrowserGlue.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "BookmarkHTMLUtils",
5252
XPCOMUtils.defineLazyModuleGetter(this, "BookmarkJSONUtils",
5353
"resource://gre/modules/BookmarkJSONUtils.jsm");
5454

55-
XPCOMUtils.defineLazyModuleGetter(this, "WebappManager",
56-
"resource:///modules/WebappManager.jsm");
57-
5855
XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
5956
"resource://gre/modules/PageThumbs.jsm");
6057

@@ -742,7 +739,6 @@ BrowserGlue.prototype = {
742739
// handle any UI migration
743740
this._migrateUI();
744741

745-
WebappManager.init();
746742
PageThumbs.init();
747743
webrtcUI.init();
748744
AboutHome.init();
@@ -1057,9 +1053,6 @@ BrowserGlue.prototype = {
10571053
}
10581054

10591055
SelfSupportBackend.uninit();
1060-
1061-
WebappManager.uninit();
1062-
10631056
NewTabPrefsProvider.prefs.uninit();
10641057
AboutNewTab.uninit();
10651058
webrtcUI.uninit();

browser/confvars.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
5353
MAR_CHANNEL_ID=firefox-mozilla-central
5454
MOZ_PROFILE_MIGRATOR=1
5555
MOZ_APP_STATIC_INI=1
56-
MOZ_WEBAPP_RUNTIME=1
5756
MOZ_MEDIA_NAVIGATOR=1
5857
MOZ_WEBGL_CONFORMANT=1
5958
# Enable navigator.mozPay

browser/installer/package-manifest.in

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -836,31 +836,6 @@ bin/libfreebl_32int64_3.so
836836
#endif
837837
#endif
838838

839-
#ifdef MOZ_WEBAPP_RUNTIME
840-
[WebappRuntime]
841-
#ifdef XP_WIN
842-
@BINPATH@/webapp-uninstaller@BIN_SUFFIX@
843-
#endif
844-
@RESPATH@/webapprt-stub@BIN_SUFFIX@
845-
@RESPATH@/webapprt/webapprt.ini
846-
@RESPATH@/webapprt/chrome.manifest
847-
@RESPATH@/webapprt/chrome/webapprt@JAREXT@
848-
@RESPATH@/webapprt/chrome/webapprt.manifest
849-
@RESPATH@/webapprt/chrome/@AB_CD@@JAREXT@
850-
@RESPATH@/webapprt/chrome/@AB_CD@.manifest
851-
@RESPATH@/webapprt/components/CommandLineHandler.js
852-
@RESPATH@/webapprt/components/ContentPermission.js
853-
@RESPATH@/webapprt/components/DirectoryProvider.js
854-
@RESPATH@/webapprt/components/PaymentUIGlue.js
855-
@RESPATH@/webapprt/components/components.manifest
856-
@RESPATH@/webapprt/defaults/preferences/prefs.js
857-
@RESPATH@/webapprt/modules/DownloadView.jsm
858-
@RESPATH@/webapprt/modules/Startup.jsm
859-
@RESPATH@/webapprt/modules/WebappRT.jsm
860-
@RESPATH@/webapprt/modules/WebappManager.jsm
861-
@RESPATH@/webapprt/modules/WebRTCHandler.jsm
862-
#endif
863-
864839
@RESPATH@/components/DataStore.manifest
865840
@RESPATH@/components/DataStoreImpl.js
866841
@RESPATH@/components/dom_datastore.xpt

browser/locales/Makefile.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ libs-%:
100100
$(NSINSTALL) -D $(DIST)/install
101101
@$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
102102
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
103-
ifdef MOZ_WEBAPP_RUNTIME
104-
@$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$*
105-
endif
106103
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
107104
@$(MAKE) -C ../extensions/pocket/locales AB_CD=$* XPI_NAME=locale-$*
108105
@$(MAKE) -C ../extensions/loop/chrome/locale AB_CD=$* XPI_NAME=locale-$*
@@ -138,14 +135,11 @@ endif
138135
clobber-zip:
139136
$(RM) $(STAGEDIST)/chrome/$(AB_CD).jar \
140137
$(STAGEDIST)/chrome/$(AB_CD).manifest \
141-
$(STAGEDIST)/webapprt/chrome/$(AB_CD).jar \
142-
$(STAGEDIST)/webapprt/chrome/$(AB_CD).manifest \
143138
$(STAGEDIST)/$(PREF_DIR)/firefox-l10n.js
144139
$(RM) -rf $(STAGEDIST)/dictionaries \
145140
$(STAGEDIST)/hyphenation \
146141
$(STAGEDIST)/defaults/profile \
147-
$(STAGEDIST)/chrome/$(AB_CD) \
148-
$(STAGEDIST)/webapprt/chrome/$(AB_CD)
142+
$(STAGEDIST)/chrome/$(AB_CD)
149143

150144

151145
langpack: langpack-$(AB_CD)

browser/locales/en-US/chrome/browser/browser.dtd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
197197
<!ENTITY urlbar.indexedDBNotificationAnchor.label "View the app-offline storage message">
198198
<!ENTITY urlbar.loginFillNotificationAnchor.label "Manage your login information">
199199
<!ENTITY urlbar.passwordNotificationAnchor.label "Check if you want to save your password">
200-
<!ENTITY urlbar.webappsNotificationAnchor.label "View the app install message">
201200
<!ENTITY urlbar.pluginsNotificationAnchor.label "Manage plugin usage on this page">
202201
<!ENTITY urlbar.webNotsNotificationAnchor3.label "Change whether you can receive notifications from the site">
203202

0 commit comments

Comments
 (0)