Bug 775803. Move WebappsInstaller to toolkit. r=glandium
authorFelipe Gomes <felipc@gmail.com>
Fri, 03 Aug 2012 20:40:30 -0700
changeset 107402 01f85b0fe9fc6b73340613e03f9244c680717d75
parent 107401 fd329615ef3e64d1ca449346df91d3845a3e1955
child 107403 d19bc0ab5a98ba027d1da77342623d3c71dd363c
push id214
push userakeybl@mozilla.com
push dateWed, 14 Nov 2012 20:38:59 +0000
treeherdermozilla-release@c8b08ec8e1aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs775803
milestone17.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
Bug 775803. Move WebappsInstaller to toolkit. r=glandium
browser/modules/Makefile.in
browser/modules/WebappsIconHelpers.js
browser/modules/WebappsInstaller.jsm
browser/modules/webappsUI.jsm
toolkit/webapps/Makefile.in
toolkit/webapps/WebappsIconHelpers.js
toolkit/webapps/WebappsInstaller.jsm
--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -25,13 +25,9 @@ EXTRA_JS_MODULES = \
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 
 EXTRA_JS_MODULES += \
 	WindowsPreviewPerTab.jsm \
 	WindowsJumpLists.jsm \
 	$(NULL)
 endif
 
-EXTRA_PP_JS_MODULES = \
-	WebappsInstaller.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/modules/webappsUI.jsm
+++ b/browser/modules/webappsUI.jsm
@@ -6,17 +6,17 @@ let EXPORTED_SYMBOLS = ["webappsUI"];
 
 let Ci = Components.interfaces;
 let Cc = Components.classes;
 let Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Webapps.jsm");
-Cu.import("resource:///modules/WebappsInstaller.jsm");
+Cu.import("resource://gre/modules/WebappsInstaller.jsm");
 Cu.import("resource://gre/modules/WebappOSUtils.jsm");
 
 let webappsUI = {
   init: function webappsUI_init() {
     Services.obs.addObserver(this, "webapps-ask-install", false);
     Services.obs.addObserver(this, "webapps-launch", false);
   },
   
--- a/toolkit/webapps/Makefile.in
+++ b/toolkit/webapps/Makefile.in
@@ -8,11 +8,12 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
 EXTRA_PP_JS_MODULES = \
 	WebappOSUtils.jsm \
+	WebappsInstaller.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
rename from browser/modules/WebappsIconHelpers.js
rename to toolkit/webapps/WebappsIconHelpers.js
rename from browser/modules/WebappsInstaller.jsm
rename to toolkit/webapps/WebappsInstaller.jsm