+ 
{mozL10n.get("first_time_experience_subheading")}
@@ -379,7 +379,7 @@ loop.panel = (function(_, mozL10n) {
_renderDefaultIcon: function() {
return (
- 
+ 
);
},
@@ -390,7 +390,7 @@ loop.panel = (function(_, mozL10n) {
-
+
{this._renderNewRoomButton()}
);
@@ -884,7 +884,7 @@ loop.panel = (function(_, mozL10n) {
return (
- 
+ 
+
+ 
{mozL10n.get("e10s_not_supported_subheading", {
brandShortname: mozL10n.get("clientShortname2")
diff --git a/browser/extensions/loop/content/panels/js/roomStore.js b/browser/components/loop/content/js/roomStore.js
similarity index 100%
rename from browser/extensions/loop/content/panels/js/roomStore.js
rename to browser/components/loop/content/js/roomStore.js
diff --git a/browser/extensions/loop/content/panels/js/roomViews.js b/browser/components/loop/content/js/roomViews.js
similarity index 99%
rename from browser/extensions/loop/content/panels/js/roomViews.js
rename to browser/components/loop/content/js/roomViews.js
index 67e02207c999..5f49fdbf1f61 100644
--- a/browser/extensions/loop/content/panels/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@@ -346,14 +346,14 @@ loop.roomViews = (function(mozL10n) {
"triggered": this.state.copiedUrl
}),
onClick: this.handleCopyButtonClick},
- React.createElement("img", {src: "shared/img/glyph-link-16x16.svg"}),
+ React.createElement("img", {src: "loop/shared/img/svg/glyph-link-16x16.svg"}),
React.createElement("p", null, mozL10n.get(this.state.copiedUrl ?
"invite_copied_link_button" : "invite_copy_link_button"))
),
React.createElement("div", {className: "btn-email invite-button",
onClick: this.handleEmailButtonClick,
onMouseOver: this.resetTriggeredButtons},
- React.createElement("img", {src: "shared/img/glyph-email-16x16.svg"}),
+ React.createElement("img", {src: "loop/shared/img/svg/glyph-email-16x16.svg"}),
React.createElement("p", null, mozL10n.get("invite_email_link_button"))
)
),
@@ -536,7 +536,7 @@ loop.roomViews = (function(mozL10n) {
}
var url = this._getURL();
- var thumbnail = url && url.thumbnail || "shared/img/icons-16x16.svg#globe";
+ var thumbnail = url && url.thumbnail || "loop/shared/img/icons-16x16.svg#globe";
var urlDescription = url && url.description || "";
var location = url && url.location || "";
diff --git a/browser/extensions/loop/content/panels/js/roomViews.jsx b/browser/components/loop/content/js/roomViews.jsx
similarity index 99%
rename from browser/extensions/loop/content/panels/js/roomViews.jsx
rename to browser/components/loop/content/js/roomViews.jsx
index 5bbbd0fb2765..7f5d66f7a6dc 100644
--- a/browser/extensions/loop/content/panels/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@@ -346,14 +346,14 @@ loop.roomViews = (function(mozL10n) {
"triggered": this.state.copiedUrl
})}
onClick={this.handleCopyButtonClick}>
- 
+ 
{mozL10n.get(this.state.copiedUrl ? "invite_copied_link_button" : "invite_copy_link_button")}
- 
+ 
@@ -536,7 +536,7 @@ loop.roomViews = (function(mozL10n) {
}
var url = this._getURL();
- var thumbnail = url && url.thumbnail || "shared/img/icons-16x16.svg#globe";
+ var thumbnail = url && url.thumbnail || "loop/shared/img/icons-16x16.svg#globe";
var urlDescription = url && url.description || "";
var location = url && url.location || "";
diff --git a/browser/extensions/loop/content/panels/vendor/l10n.js b/browser/components/loop/content/libs/l10n.js
similarity index 100%
rename from browser/extensions/loop/content/panels/vendor/l10n.js
rename to browser/components/loop/content/libs/l10n.js
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
new file mode 100644
index 000000000000..87fb62711b2c
--- /dev/null
+++ b/browser/components/loop/content/panel.html
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/browser/extensions/loop/content/shared/README.md b/browser/components/loop/content/shared/README.md
similarity index 100%
rename from browser/extensions/loop/content/shared/README.md
rename to browser/components/loop/content/shared/README.md
diff --git a/browser/extensions/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
similarity index 100%
rename from browser/extensions/loop/content/shared/css/common.css
rename to browser/components/loop/content/shared/css/common.css
diff --git a/browser/extensions/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
similarity index 95%
rename from browser/extensions/loop/content/shared/css/conversation.css
rename to browser/components/loop/content/shared/css/conversation.css
index aacca74062f4..b56876429489 100644
--- a/browser/extensions/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -65,7 +65,7 @@ html[dir="rtl"] .conversation-toolbar > li {
background-position: center;
background-repeat: no-repeat;
background-color: transparent;
- background-image: url("../img/media-group.svg");
+ background-image: url("../img/svg/media-group.svg");
background-size: cover;
height: 28px;
width: 67px;
@@ -73,25 +73,25 @@ html[dir="rtl"] .conversation-toolbar > li {
.conversation-toolbar-media-btn-group-box > button:last-child:active,
.conversation-toolbar-media-btn-group-box > button:last-child:hover {
- background-image: url("../img/media-group-right-hover.svg");
+ background-image: url("../img/svg/media-group-right-hover.svg");
background-size: cover;
}
html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:last-child:active,
html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:last-child:hover {
- background-image: url("../img/media-group-left-hover.svg");
+ background-image: url("../img/svg/media-group-left-hover.svg");
background-size: cover;
}
.conversation-toolbar-media-btn-group-box > button:first-child:active,
.conversation-toolbar-media-btn-group-box > button:first-child:hover {
- background-image: url("../img/media-group-left-hover.svg");
+ background-image: url("../img/svg/media-group-left-hover.svg");
background-size: cover;
}
html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:first-child:active,
html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:first-child:hover {
- background-image: url("../img/media-group-right-hover.svg");
+ background-image: url("../img/svg/media-group-right-hover.svg");
background-size: cover;
}
@@ -106,76 +106,76 @@ html[dir="rtl"] .conversation-toolbar-btn-box.btn-edit-entry {
/* conversationViews.jsx */
.conversation-toolbar .btn-hangup {
- background-image: url("../img/exit.svg");
+ background-image: url("../img/svg/exit.svg");
border: 0;
}
/* Audio mute button */
.btn-mute-audio:after {
- content: url("../img/audio.svg");
+ content: url("../img/svg/audio.svg");
}
.btn-mute-audio.muted:after {
- content: url("../img/audio-mute.svg");
+ content: url("../img/svg/audio-mute.svg");
}
.btn-mute-audio:hover:after,
.btn-mute-audio:active:after {
- content: url("../img/audio-hover.svg");
+ content: url("../img/svg/audio-hover.svg");
}
.btn-mute-audio.muted:hover:after,
.btn-mute-audio.muted:active:after {
- content: url("../img/audio-mute-hover.svg");
+ content: url("../img/svg/audio-mute-hover.svg");
}
/* Video mute button */
.btn-mute-video:after {
- content: url("../img/video.svg");
+ content: url("../img/svg/video.svg");
}
.btn-mute-video:active:after,
.btn-mute-video:hover:after {
- content: url("../img/video-hover.svg");
+ content: url("../img/svg/video-hover.svg");
}
.btn-mute-video.muted:after {
- content: url("../img/video-mute.svg");
+ content: url("../img/svg/video-mute.svg");
}
.btn-mute-video.muted:hover:after,
.btn-mute-video.muted:active:after {
- content: url("../img/video-mute-hover.svg");
+ content: url("../img/svg/video-mute-hover.svg");
}
.btn-settings {
width: 28px;
height: 28px;
background-size: 28px;
- background-image: url("../img/settings.svg");
+ background-image: url("../img/svg/settings.svg");
background-color: transparent;
}
.btn-settings:hover,
.btn-settings:active {
- background-image: url("../img/settings-hover.svg");
+ background-image: url("../img/svg/settings-hover.svg");
}
.btn-screen-share {
- background-image: url("../img/sharing.svg");
+ background-image: url("../img/svg/sharing.svg");
}
.btn-screen-share:hover,
.btn-screen-share:active {
- background-image: url("../img/sharing-hover.svg");
+ background-image: url("../img/svg/sharing-hover.svg");
}
.btn-screen-share.active {
- background-image: url("../img/sharing-active.svg");
+ background-image: url("../img/svg/sharing-active.svg");
}
.btn-screen-share.disabled {
/* The screen share button is in its pending state when its disabled. */
- background-image: url("../img/sharing-pending.svg");
+ background-image: url("../img/svg/sharing-pending.svg");
}
/* General Call (incoming or outgoing). */
diff --git a/browser/extensions/loop/content/shared/css/reset.css b/browser/components/loop/content/shared/css/reset.css
similarity index 100%
rename from browser/extensions/loop/content/shared/css/reset.css
rename to browser/components/loop/content/shared/css/reset.css
diff --git a/browser/extensions/loop/content/shared/img/02.png b/browser/components/loop/content/shared/img/02.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/02.png
rename to browser/components/loop/content/shared/img/02.png
diff --git a/browser/extensions/loop/content/shared/img/02@2x.png b/browser/components/loop/content/shared/img/02@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/02@2x.png
rename to browser/components/loop/content/shared/img/02@2x.png
diff --git a/browser/extensions/loop/content/shared/img/animated-spinner.svg b/browser/components/loop/content/shared/img/animated-spinner.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/animated-spinner.svg
rename to browser/components/loop/content/shared/img/animated-spinner.svg
diff --git a/browser/extensions/loop/content/shared/img/audio-call-avatar.svg b/browser/components/loop/content/shared/img/audio-call-avatar.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/audio-call-avatar.svg
rename to browser/components/loop/content/shared/img/audio-call-avatar.svg
diff --git a/browser/extensions/loop/content/shared/img/audio-default-16x16@1.5x.png b/browser/components/loop/content/shared/img/audio-default-16x16@1.5x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/audio-default-16x16@1.5x.png
rename to browser/components/loop/content/shared/img/audio-default-16x16@1.5x.png
diff --git a/browser/extensions/loop/content/shared/img/audio-default-16x16@2x.png b/browser/components/loop/content/shared/img/audio-default-16x16@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/audio-default-16x16@2x.png
rename to browser/components/loop/content/shared/img/audio-default-16x16@2x.png
diff --git a/browser/extensions/loop/content/shared/img/avatars.svg b/browser/components/loop/content/shared/img/avatars.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/avatars.svg
rename to browser/components/loop/content/shared/img/avatars.svg
diff --git a/browser/extensions/loop/content/shared/img/beta-ribbon.svg b/browser/components/loop/content/shared/img/beta-ribbon.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/beta-ribbon.svg
rename to browser/components/loop/content/shared/img/beta-ribbon.svg
diff --git a/browser/extensions/loop/content/shared/img/chatbubble-arrow-left.svg b/browser/components/loop/content/shared/img/chatbubble-arrow-left.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/chatbubble-arrow-left.svg
rename to browser/components/loop/content/shared/img/chatbubble-arrow-left.svg
diff --git a/browser/extensions/loop/content/shared/img/chatbubble-arrow-right.svg b/browser/components/loop/content/shared/img/chatbubble-arrow-right.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/chatbubble-arrow-right.svg
rename to browser/components/loop/content/shared/img/chatbubble-arrow-right.svg
diff --git a/browser/extensions/loop/content/shared/img/check.svg b/browser/components/loop/content/shared/img/check.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/check.svg
rename to browser/components/loop/content/shared/img/check.svg
diff --git a/browser/extensions/loop/content/shared/img/ellipsis-v.svg b/browser/components/loop/content/shared/img/ellipsis-v.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/ellipsis-v.svg
rename to browser/components/loop/content/shared/img/ellipsis-v.svg
diff --git a/browser/extensions/loop/content/shared/img/empty_conversations.svg b/browser/components/loop/content/shared/img/empty_conversations.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/empty_conversations.svg
rename to browser/components/loop/content/shared/img/empty_conversations.svg
diff --git a/browser/extensions/loop/content/shared/img/empty_search.svg b/browser/components/loop/content/shared/img/empty_search.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/empty_search.svg
rename to browser/components/loop/content/shared/img/empty_search.svg
diff --git a/browser/extensions/loop/content/shared/img/facemute-14x14.png b/browser/components/loop/content/shared/img/facemute-14x14.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/facemute-14x14.png
rename to browser/components/loop/content/shared/img/facemute-14x14.png
diff --git a/browser/extensions/loop/content/shared/img/facemute-14x14@2x.png b/browser/components/loop/content/shared/img/facemute-14x14@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/facemute-14x14@2x.png
rename to browser/components/loop/content/shared/img/facemute-14x14@2x.png
diff --git a/browser/extensions/loop/content/shared/img/firefox-avatar.svg b/browser/components/loop/content/shared/img/firefox-avatar.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/firefox-avatar.svg
rename to browser/components/loop/content/shared/img/firefox-avatar.svg
diff --git a/browser/extensions/loop/content/shared/img/firefox-logo.png b/browser/components/loop/content/shared/img/firefox-logo.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/firefox-logo.png
rename to browser/components/loop/content/shared/img/firefox-logo.png
diff --git a/browser/extensions/loop/content/shared/img/hangup-inverse-14x14.png b/browser/components/loop/content/shared/img/hangup-inverse-14x14.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/hangup-inverse-14x14.png
rename to browser/components/loop/content/shared/img/hangup-inverse-14x14.png
diff --git a/browser/extensions/loop/content/shared/img/hangup-inverse-14x14@2x.png b/browser/components/loop/content/shared/img/hangup-inverse-14x14@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/hangup-inverse-14x14@2x.png
rename to browser/components/loop/content/shared/img/hangup-inverse-14x14@2x.png
diff --git a/browser/extensions/loop/content/shared/img/happy.png b/browser/components/loop/content/shared/img/happy.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/happy.png
rename to browser/components/loop/content/shared/img/happy.png
diff --git a/browser/extensions/loop/content/shared/img/hello_logo.svg b/browser/components/loop/content/shared/img/hello_logo.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/hello_logo.svg
rename to browser/components/loop/content/shared/img/hello_logo.svg
diff --git a/browser/extensions/loop/content/shared/img/helloicon.svg b/browser/components/loop/content/shared/img/helloicon.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/helloicon.svg
rename to browser/components/loop/content/shared/img/helloicon.svg
diff --git a/browser/extensions/loop/content/shared/img/icon_32.png b/browser/components/loop/content/shared/img/icon_32.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/icon_32.png
rename to browser/components/loop/content/shared/img/icon_32.png
diff --git a/browser/extensions/loop/content/shared/img/icon_64.png b/browser/components/loop/content/shared/img/icon_64.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/icon_64.png
rename to browser/components/loop/content/shared/img/icon_64.png
diff --git a/browser/extensions/loop/content/shared/img/icons-10x10.svg b/browser/components/loop/content/shared/img/icons-10x10.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/icons-10x10.svg
rename to browser/components/loop/content/shared/img/icons-10x10.svg
diff --git a/browser/extensions/loop/content/shared/img/icons-14x14.svg b/browser/components/loop/content/shared/img/icons-14x14.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/icons-14x14.svg
rename to browser/components/loop/content/shared/img/icons-14x14.svg
diff --git a/browser/extensions/loop/content/shared/img/icons-16x16.svg b/browser/components/loop/content/shared/img/icons-16x16.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/icons-16x16.svg
rename to browser/components/loop/content/shared/img/icons-16x16.svg
diff --git a/browser/extensions/loop/content/shared/img/movistar.png b/browser/components/loop/content/shared/img/movistar.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/movistar.png
rename to browser/components/loop/content/shared/img/movistar.png
diff --git a/browser/extensions/loop/content/shared/img/movistar@2x.png b/browser/components/loop/content/shared/img/movistar@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/movistar@2x.png
rename to browser/components/loop/content/shared/img/movistar@2x.png
diff --git a/browser/extensions/loop/content/shared/img/mute-inverse-14x14.png b/browser/components/loop/content/shared/img/mute-inverse-14x14.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/mute-inverse-14x14.png
rename to browser/components/loop/content/shared/img/mute-inverse-14x14.png
diff --git a/browser/extensions/loop/content/shared/img/mute-inverse-14x14@2x.png b/browser/components/loop/content/shared/img/mute-inverse-14x14@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/mute-inverse-14x14@2x.png
rename to browser/components/loop/content/shared/img/mute-inverse-14x14@2x.png
diff --git a/browser/extensions/loop/content/shared/img/pause-12x12.svg b/browser/components/loop/content/shared/img/pause-12x12.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/pause-12x12.svg
rename to browser/components/loop/content/shared/img/pause-12x12.svg
diff --git a/browser/extensions/loop/content/shared/img/play-12x12.svg b/browser/components/loop/content/shared/img/play-12x12.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/play-12x12.svg
rename to browser/components/loop/content/shared/img/play-12x12.svg
diff --git a/browser/extensions/loop/content/shared/img/sad.png b/browser/components/loop/content/shared/img/sad.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/sad.png
rename to browser/components/loop/content/shared/img/sad.png
diff --git a/browser/extensions/loop/content/shared/img/sad_hello_icon_64x64.svg b/browser/components/loop/content/shared/img/sad_hello_icon_64x64.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/sad_hello_icon_64x64.svg
rename to browser/components/loop/content/shared/img/sad_hello_icon_64x64.svg
diff --git a/browser/extensions/loop/content/shared/img/spinner.png b/browser/components/loop/content/shared/img/spinner.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/spinner.png
rename to browser/components/loop/content/shared/img/spinner.png
diff --git a/browser/extensions/loop/content/shared/img/spinner.svg b/browser/components/loop/content/shared/img/spinner.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/spinner.svg
rename to browser/components/loop/content/shared/img/spinner.svg
diff --git a/browser/extensions/loop/content/shared/img/spinner@2x.png b/browser/components/loop/content/shared/img/spinner@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/spinner@2x.png
rename to browser/components/loop/content/shared/img/spinner@2x.png
diff --git a/browser/extensions/loop/content/shared/img/stop-12x12.svg b/browser/components/loop/content/shared/img/stop-12x12.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/stop-12x12.svg
rename to browser/components/loop/content/shared/img/stop-12x12.svg
diff --git a/browser/extensions/loop/content/shared/img/audio-hover.svg b/browser/components/loop/content/shared/img/svg/audio-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/audio-hover.svg
rename to browser/components/loop/content/shared/img/svg/audio-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/audio-mute-hover.svg b/browser/components/loop/content/shared/img/svg/audio-mute-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/audio-mute-hover.svg
rename to browser/components/loop/content/shared/img/svg/audio-mute-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/audio-mute.svg b/browser/components/loop/content/shared/img/svg/audio-mute.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/audio-mute.svg
rename to browser/components/loop/content/shared/img/svg/audio-mute.svg
diff --git a/browser/extensions/loop/content/shared/img/audio.svg b/browser/components/loop/content/shared/img/svg/audio.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/audio.svg
rename to browser/components/loop/content/shared/img/svg/audio.svg
diff --git a/browser/extensions/loop/content/shared/img/cam_audio-no.svg b/browser/components/loop/content/shared/img/svg/cam_audio-no.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/cam_audio-no.svg
rename to browser/components/loop/content/shared/img/svg/cam_audio-no.svg
diff --git a/browser/extensions/loop/content/shared/img/cam_audio.svg b/browser/components/loop/content/shared/img/svg/cam_audio.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/cam_audio.svg
rename to browser/components/loop/content/shared/img/svg/cam_audio.svg
diff --git a/browser/extensions/loop/content/shared/img/cam_audio_h.svg b/browser/components/loop/content/shared/img/svg/cam_audio_h.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/cam_audio_h.svg
rename to browser/components/loop/content/shared/img/svg/cam_audio_h.svg
diff --git a/browser/extensions/loop/content/shared/img/exit.svg b/browser/components/loop/content/shared/img/svg/exit.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/exit.svg
rename to browser/components/loop/content/shared/img/svg/exit.svg
diff --git a/browser/extensions/loop/content/shared/img/glyph-email-16x16.svg b/browser/components/loop/content/shared/img/svg/glyph-email-16x16.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/glyph-email-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-email-16x16.svg
diff --git a/browser/extensions/loop/content/shared/img/glyph-facebook-16x16.svg b/browser/components/loop/content/shared/img/svg/glyph-facebook-16x16.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/glyph-facebook-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-facebook-16x16.svg
diff --git a/browser/extensions/loop/content/shared/img/glyph-help-16x16.svg b/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/glyph-help-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg
diff --git a/browser/extensions/loop/content/shared/img/glyph-link-16x16.svg b/browser/components/loop/content/shared/img/svg/glyph-link-16x16.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/glyph-link-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-link-16x16.svg
diff --git a/browser/extensions/loop/content/shared/img/glyph-user-16x16.svg b/browser/components/loop/content/shared/img/svg/glyph-user-16x16.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/glyph-user-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-user-16x16.svg
diff --git a/browser/extensions/loop/content/shared/img/media-group-left-hover.svg b/browser/components/loop/content/shared/img/svg/media-group-left-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/media-group-left-hover.svg
rename to browser/components/loop/content/shared/img/svg/media-group-left-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/media-group-right-hover.svg b/browser/components/loop/content/shared/img/svg/media-group-right-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/media-group-right-hover.svg
rename to browser/components/loop/content/shared/img/svg/media-group-right-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/media-group.svg b/browser/components/loop/content/shared/img/svg/media-group.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/media-group.svg
rename to browser/components/loop/content/shared/img/svg/media-group.svg
diff --git a/browser/extensions/loop/content/shared/img/settings-hover.svg b/browser/components/loop/content/shared/img/svg/settings-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/settings-hover.svg
rename to browser/components/loop/content/shared/img/svg/settings-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/settings.svg b/browser/components/loop/content/shared/img/svg/settings.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/settings.svg
rename to browser/components/loop/content/shared/img/svg/settings.svg
diff --git a/browser/extensions/loop/content/shared/img/sharing-active.svg b/browser/components/loop/content/shared/img/svg/sharing-active.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/sharing-active.svg
rename to browser/components/loop/content/shared/img/svg/sharing-active.svg
diff --git a/browser/extensions/loop/content/shared/img/sharing-hover.svg b/browser/components/loop/content/shared/img/svg/sharing-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/sharing-hover.svg
rename to browser/components/loop/content/shared/img/svg/sharing-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/sharing-pending.svg b/browser/components/loop/content/shared/img/svg/sharing-pending.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/sharing-pending.svg
rename to browser/components/loop/content/shared/img/svg/sharing-pending.svg
diff --git a/browser/extensions/loop/content/shared/img/sharing.svg b/browser/components/loop/content/shared/img/svg/sharing.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/sharing.svg
rename to browser/components/loop/content/shared/img/svg/sharing.svg
diff --git a/browser/extensions/loop/content/shared/img/video-hover.svg b/browser/components/loop/content/shared/img/svg/video-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/video-hover.svg
rename to browser/components/loop/content/shared/img/svg/video-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/video-mute-hover.svg b/browser/components/loop/content/shared/img/svg/video-mute-hover.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/video-mute-hover.svg
rename to browser/components/loop/content/shared/img/svg/video-mute-hover.svg
diff --git a/browser/extensions/loop/content/shared/img/video-mute.svg b/browser/components/loop/content/shared/img/svg/video-mute.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/video-mute.svg
rename to browser/components/loop/content/shared/img/svg/video-mute.svg
diff --git a/browser/extensions/loop/content/shared/img/video.svg b/browser/components/loop/content/shared/img/svg/video.svg
similarity index 100%
rename from browser/extensions/loop/content/shared/img/video.svg
rename to browser/components/loop/content/shared/img/svg/video.svg
diff --git a/browser/extensions/loop/content/shared/img/telefonica.png b/browser/components/loop/content/shared/img/telefonica.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/telefonica.png
rename to browser/components/loop/content/shared/img/telefonica.png
diff --git a/browser/extensions/loop/content/shared/img/telefonica@2x.png b/browser/components/loop/content/shared/img/telefonica@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/telefonica@2x.png
rename to browser/components/loop/content/shared/img/telefonica@2x.png
diff --git a/browser/extensions/loop/content/shared/img/vivo.png b/browser/components/loop/content/shared/img/vivo.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/vivo.png
rename to browser/components/loop/content/shared/img/vivo.png
diff --git a/browser/extensions/loop/content/shared/img/vivo@2x.png b/browser/components/loop/content/shared/img/vivo@2x.png
similarity index 100%
rename from browser/extensions/loop/content/shared/img/vivo@2x.png
rename to browser/components/loop/content/shared/img/vivo@2x.png
diff --git a/browser/extensions/loop/content/shared/js/actions.js b/browser/components/loop/content/shared/js/actions.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/actions.js
rename to browser/components/loop/content/shared/js/actions.js
diff --git a/browser/extensions/loop/content/shared/js/activeRoomStore.js b/browser/components/loop/content/shared/js/activeRoomStore.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/activeRoomStore.js
rename to browser/components/loop/content/shared/js/activeRoomStore.js
diff --git a/browser/extensions/loop/content/shared/js/crypto.js b/browser/components/loop/content/shared/js/crypto.js
similarity index 98%
rename from browser/extensions/loop/content/shared/js/crypto.js
rename to browser/components/loop/content/shared/js/crypto.js
index 22b0616d2451..b067698f44d1 100644
--- a/browser/extensions/loop/content/shared/js/crypto.js
+++ b/browser/components/loop/content/shared/js/crypto.js
@@ -18,7 +18,7 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
rootObject = {
crypto: crypto
};
- sharedUtils = Cu.import("chrome://loop/content/shared/js/utils.js", {}).utils;
+ sharedUtils = Cu.import("resource:///modules/loop/utils.js", {}).utils;
} else {
sharedUtils = this.shared.utils;
}
diff --git a/browser/extensions/loop/content/shared/js/dispatcher.js b/browser/components/loop/content/shared/js/dispatcher.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/dispatcher.js
rename to browser/components/loop/content/shared/js/dispatcher.js
diff --git a/browser/extensions/loop/content/shared/js/linkifiedTextView.js b/browser/components/loop/content/shared/js/linkifiedTextView.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/linkifiedTextView.js
rename to browser/components/loop/content/shared/js/linkifiedTextView.js
diff --git a/browser/extensions/loop/content/shared/js/linkifiedTextView.jsx b/browser/components/loop/content/shared/js/linkifiedTextView.jsx
similarity index 100%
rename from browser/extensions/loop/content/shared/js/linkifiedTextView.jsx
rename to browser/components/loop/content/shared/js/linkifiedTextView.jsx
diff --git a/browser/extensions/loop/content/shared/js/loopapi-client.js b/browser/components/loop/content/shared/js/loopapi-client.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/loopapi-client.js
rename to browser/components/loop/content/shared/js/loopapi-client.js
diff --git a/browser/extensions/loop/content/shared/js/mixins.js b/browser/components/loop/content/shared/js/mixins.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/mixins.js
rename to browser/components/loop/content/shared/js/mixins.js
diff --git a/browser/extensions/loop/content/shared/js/models.js b/browser/components/loop/content/shared/js/models.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/models.js
rename to browser/components/loop/content/shared/js/models.js
diff --git a/browser/extensions/loop/content/shared/js/otSdkDriver.js b/browser/components/loop/content/shared/js/otSdkDriver.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/otSdkDriver.js
rename to browser/components/loop/content/shared/js/otSdkDriver.js
diff --git a/browser/extensions/loop/content/shared/js/store.js b/browser/components/loop/content/shared/js/store.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/store.js
rename to browser/components/loop/content/shared/js/store.js
diff --git a/browser/extensions/loop/content/shared/js/textChatStore.js b/browser/components/loop/content/shared/js/textChatStore.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/textChatStore.js
rename to browser/components/loop/content/shared/js/textChatStore.js
diff --git a/browser/extensions/loop/content/shared/js/textChatView.js b/browser/components/loop/content/shared/js/textChatView.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/textChatView.js
rename to browser/components/loop/content/shared/js/textChatView.js
diff --git a/browser/extensions/loop/content/shared/js/textChatView.jsx b/browser/components/loop/content/shared/js/textChatView.jsx
similarity index 100%
rename from browser/extensions/loop/content/shared/js/textChatView.jsx
rename to browser/components/loop/content/shared/js/textChatView.jsx
diff --git a/browser/extensions/loop/content/shared/js/urlRegExps.js b/browser/components/loop/content/shared/js/urlRegExps.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/urlRegExps.js
rename to browser/components/loop/content/shared/js/urlRegExps.js
diff --git a/browser/extensions/loop/content/shared/js/utils.js b/browser/components/loop/content/shared/js/utils.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/utils.js
rename to browser/components/loop/content/shared/js/utils.js
diff --git a/browser/extensions/loop/content/shared/js/validate.js b/browser/components/loop/content/shared/js/validate.js
similarity index 100%
rename from browser/extensions/loop/content/shared/js/validate.js
rename to browser/components/loop/content/shared/js/validate.js
diff --git a/browser/extensions/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
similarity index 99%
rename from browser/extensions/loop/content/shared/js/views.js
rename to browser/components/loop/content/shared/js/views.js
index bdb6caea01d4..34cbc45c5fe9 100644
--- a/browser/extensions/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -854,7 +854,7 @@ loop.shared.views = (function(_, mozL10n) {
if (!thumbnail) {
thumbnail = this.props.useDesktopPaths ?
- "shared/img/icons-16x16.svg#globe" :
+ "loop/shared/img/icons-16x16.svg#globe" :
"shared/img/icons-16x16.svg#globe";
}
diff --git a/browser/extensions/loop/content/shared/js/views.jsx b/browser/components/loop/content/shared/js/views.jsx
similarity index 99%
rename from browser/extensions/loop/content/shared/js/views.jsx
rename to browser/components/loop/content/shared/js/views.jsx
index 723e739f29b4..9eb26b42e6e3 100644
--- a/browser/extensions/loop/content/shared/js/views.jsx
+++ b/browser/components/loop/content/shared/js/views.jsx
@@ -854,7 +854,7 @@ loop.shared.views = (function(_, mozL10n) {
if (!thumbnail) {
thumbnail = this.props.useDesktopPaths ?
- "shared/img/icons-16x16.svg#globe" :
+ "loop/shared/img/icons-16x16.svg#globe" :
"shared/img/icons-16x16.svg#globe";
}
diff --git a/browser/extensions/loop/content/shared/vendor/backbone-1.2.1.js b/browser/components/loop/content/shared/libs/backbone-1.2.1.js
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/backbone-1.2.1.js
rename to browser/components/loop/content/shared/libs/backbone-1.2.1.js
diff --git a/browser/extensions/loop/content/shared/vendor/classnames-2.2.0.js b/browser/components/loop/content/shared/libs/classnames-2.2.0.js
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/classnames-2.2.0.js
rename to browser/components/loop/content/shared/libs/classnames-2.2.0.js
diff --git a/browser/extensions/loop/content/shared/vendor/lodash-3.9.3.js b/browser/components/loop/content/shared/libs/lodash-3.9.3.js
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/lodash-3.9.3.js
rename to browser/components/loop/content/shared/libs/lodash-3.9.3.js
diff --git a/browser/extensions/loop/content/shared/vendor/react-0.13.3-prod.js b/browser/components/loop/content/shared/libs/react-0.13.3-prod.js
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/react-0.13.3-prod.js
rename to browser/components/loop/content/shared/libs/react-0.13.3-prod.js
diff --git a/browser/extensions/loop/content/shared/vendor/react-0.13.3.js b/browser/components/loop/content/shared/libs/react-0.13.3.js
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/react-0.13.3.js
rename to browser/components/loop/content/shared/libs/react-0.13.3.js
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/css/ot.css b/browser/components/loop/content/shared/libs/sdk-content/css/ot.css
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/css/ot.css
rename to browser/components/loop/content/shared/libs/sdk-content/css/ot.css
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-chrome.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-chrome.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-chrome.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-chrome.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-copy-firefox.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-copy-firefox.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-firefox.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-firefox.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-firefox.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-firefox.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-predenied-chrome.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-predenied-chrome.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-predenied-chrome.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-predenied-chrome.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-prompt-chrome.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-prompt-chrome.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-prompt-chrome.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-prompt-chrome.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-publisher.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-publisher.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-publisher.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-publisher.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-subscriber.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-subscriber.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-subscriber.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-subscriber.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/buttons.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/buttons.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/buttons.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/buttons.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/loader.gif b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/loader.gif
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/loader.gif
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/loader.gif
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-off.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-off.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-off.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-off.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-on.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-on.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-on.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-on.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-off.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-off.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-off.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-off.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-on.png b/browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-on.png
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-on.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-on.png
diff --git a/browser/extensions/loop/content/shared/vendor/sdk-content/js/dynamic_config.min.js b/browser/components/loop/content/shared/libs/sdk-content/js/dynamic_config.min.js
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk-content/js/dynamic_config.min.js
rename to browser/components/loop/content/shared/libs/sdk-content/js/dynamic_config.min.js
diff --git a/browser/extensions/loop/content/shared/vendor/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
similarity index 100%
rename from browser/extensions/loop/content/shared/vendor/sdk.js
rename to browser/components/loop/content/shared/libs/sdk.js
diff --git a/browser/extensions/loop/content/shared/sounds/connected.ogg b/browser/components/loop/content/shared/sounds/connected.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/connected.ogg
rename to browser/components/loop/content/shared/sounds/connected.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/connecting.ogg b/browser/components/loop/content/shared/sounds/connecting.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/connecting.ogg
rename to browser/components/loop/content/shared/sounds/connecting.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/failure.ogg b/browser/components/loop/content/shared/sounds/failure.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/failure.ogg
rename to browser/components/loop/content/shared/sounds/failure.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/message.ogg b/browser/components/loop/content/shared/sounds/message.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/message.ogg
rename to browser/components/loop/content/shared/sounds/message.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/ringtone.ogg b/browser/components/loop/content/shared/sounds/ringtone.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/ringtone.ogg
rename to browser/components/loop/content/shared/sounds/ringtone.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/room-joined-in.ogg b/browser/components/loop/content/shared/sounds/room-joined-in.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/room-joined-in.ogg
rename to browser/components/loop/content/shared/sounds/room-joined-in.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/room-joined.ogg b/browser/components/loop/content/shared/sounds/room-joined.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/room-joined.ogg
rename to browser/components/loop/content/shared/sounds/room-joined.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/room-left.ogg b/browser/components/loop/content/shared/sounds/room-left.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/room-left.ogg
rename to browser/components/loop/content/shared/sounds/room-left.ogg
diff --git a/browser/extensions/loop/content/shared/sounds/terminated.ogg b/browser/components/loop/content/shared/sounds/terminated.ogg
similarity index 100%
rename from browser/extensions/loop/content/shared/sounds/terminated.ogg
rename to browser/components/loop/content/shared/sounds/terminated.ogg
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
new file mode 100644
index 000000000000..3532277924e4
--- /dev/null
+++ b/browser/components/loop/jar.mn
@@ -0,0 +1,136 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+ # Desktop html files
+ content/browser/loop/conversation.html (content/conversation.html)
+ content/browser/loop/panel.html (content/panel.html)
+
+ # Desktop libs (see bottom of this file for TokBox sdk assets)
+ content/browser/loop/libs/l10n.js (content/libs/l10n.js)
+
+ # Desktop script
+ content/browser/loop/js/conversation.js (content/js/conversation.js)
+ content/browser/loop/js/conversationAppStore.js (content/js/conversationAppStore.js)
+ content/browser/loop/js/otconfig.js (content/js/otconfig.js)
+ content/browser/loop/js/panel.js (content/js/panel.js)
+ content/browser/loop/js/roomStore.js (content/js/roomStore.js)
+ content/browser/loop/js/roomViews.js (content/js/roomViews.js)
+ content/browser/loop/js/feedbackViews.js (content/js/feedbackViews.js)
+
+ # Desktop styles
+ content/browser/loop/css/panel.css (content/css/panel.css)
+
+ # Shared styles
+ content/browser/loop/shared/css/reset.css (content/shared/css/reset.css)
+ content/browser/loop/shared/css/common.css (content/shared/css/common.css)
+ content/browser/loop/shared/css/conversation.css (content/shared/css/conversation.css)
+
+ # Shared images
+ content/browser/loop/shared/img/helloicon.svg (content/shared/img/helloicon.svg)
+ content/browser/loop/shared/img/icon_32.png (content/shared/img/icon_32.png)
+ content/browser/loop/shared/img/icon_64.png (content/shared/img/icon_64.png)
+ content/browser/loop/shared/img/spinner.svg (content/shared/img/spinner.svg)
+ # XXX could get rid of the png spinner usages and replace them with the svg
+ # one?
+ content/browser/loop/shared/img/spinner.png (content/shared/img/spinner.png)
+ content/browser/loop/shared/img/spinner@2x.png (content/shared/img/spinner@2x.png)
+ content/browser/loop/shared/img/sad_hello_icon_64x64.svg (content/shared/img/sad_hello_icon_64x64.svg)
+ content/browser/loop/shared/img/chatbubble-arrow-left.svg (content/shared/img/chatbubble-arrow-left.svg)
+ content/browser/loop/shared/img/chatbubble-arrow-right.svg (content/shared/img/chatbubble-arrow-right.svg)
+ content/browser/loop/shared/img/facemute-14x14.png (content/shared/img/facemute-14x14.png)
+ content/browser/loop/shared/img/facemute-14x14@2x.png (content/shared/img/facemute-14x14@2x.png)
+ content/browser/loop/shared/img/hangup-inverse-14x14.png (content/shared/img/hangup-inverse-14x14.png)
+ content/browser/loop/shared/img/hangup-inverse-14x14@2x.png (content/shared/img/hangup-inverse-14x14@2x.png)
+ content/browser/loop/shared/img/mute-inverse-14x14.png (content/shared/img/mute-inverse-14x14.png)
+ content/browser/loop/shared/img/mute-inverse-14x14@2x.png (content/shared/img/mute-inverse-14x14@2x.png)
+ content/browser/loop/shared/img/svg/glyph-email-16x16.svg (content/shared/img/svg/glyph-email-16x16.svg)
+ content/browser/loop/shared/img/svg/glyph-facebook-16x16.svg (content/shared/img/svg/glyph-facebook-16x16.svg)
+ content/browser/loop/shared/img/svg/glyph-help-16x16.svg (content/shared/img/svg/glyph-help-16x16.svg)
+ content/browser/loop/shared/img/svg/glyph-link-16x16.svg (content/shared/img/svg/glyph-link-16x16.svg)
+ content/browser/loop/shared/img/svg/glyph-user-16x16.svg (content/shared/img/svg/glyph-user-16x16.svg)
+ content/browser/loop/shared/img/svg/exit.svg (content/shared/img/svg/exit.svg)
+ content/browser/loop/shared/img/svg/audio.svg (content/shared/img/svg/audio.svg)
+ content/browser/loop/shared/img/svg/audio-hover.svg (content/shared/img/svg/audio-hover.svg)
+ content/browser/loop/shared/img/svg/audio-mute.svg (content/shared/img/svg/audio-mute.svg)
+ content/browser/loop/shared/img/svg/audio-mute-hover.svg (content/shared/img/svg/audio-mute-hover.svg)
+ content/browser/loop/shared/img/svg/video.svg (content/shared/img/svg/video.svg)
+ content/browser/loop/shared/img/svg/video-hover.svg (content/shared/img/svg/video-hover.svg)
+ content/browser/loop/shared/img/svg/video-mute.svg (content/shared/img/svg/video-mute.svg)
+ content/browser/loop/shared/img/svg/video-mute-hover.svg (content/shared/img/svg/video-mute-hover.svg)
+ content/browser/loop/shared/img/svg/settings.svg (content/shared/img/svg/settings.svg)
+ content/browser/loop/shared/img/svg/settings-hover.svg (content/shared/img/svg/settings-hover.svg)
+ content/browser/loop/shared/img/svg/sharing.svg (content/shared/img/svg/sharing.svg)
+ content/browser/loop/shared/img/svg/sharing-active.svg (content/shared/img/svg/sharing-active.svg)
+ content/browser/loop/shared/img/svg/sharing-pending.svg (content/shared/img/svg/sharing-pending.svg)
+ content/browser/loop/shared/img/svg/sharing-hover.svg (content/shared/img/svg/sharing-hover.svg)
+ content/browser/loop/shared/img/svg/media-group.svg (content/shared/img/svg/media-group.svg)
+ content/browser/loop/shared/img/svg/media-group-left-hover.svg (content/shared/img/svg/media-group-left-hover.svg)
+ content/browser/loop/shared/img/svg/media-group-right-hover.svg (content/shared/img/svg/media-group-right-hover.svg)
+ content/browser/loop/shared/img/audio-call-avatar.svg (content/shared/img/audio-call-avatar.svg)
+ content/browser/loop/shared/img/beta-ribbon.svg (content/shared/img/beta-ribbon.svg)
+ content/browser/loop/shared/img/check.svg (content/shared/img/check.svg)
+ content/browser/loop/shared/img/icons-10x10.svg (content/shared/img/icons-10x10.svg)
+ content/browser/loop/shared/img/icons-14x14.svg (content/shared/img/icons-14x14.svg)
+ content/browser/loop/shared/img/icons-16x16.svg (content/shared/img/icons-16x16.svg)
+ content/browser/loop/shared/img/movistar.png (content/shared/img/movistar.png)
+ content/browser/loop/shared/img/movistar@2x.png (content/shared/img/movistar@2x.png)
+ content/browser/loop/shared/img/vivo.png (content/shared/img/vivo.png)
+ content/browser/loop/shared/img/vivo@2x.png (content/shared/img/vivo@2x.png)
+ content/browser/loop/shared/img/02.png (content/shared/img/02.png)
+ content/browser/loop/shared/img/02@2x.png (content/shared/img/02@2x.png)
+ content/browser/loop/shared/img/telefonica.png (content/shared/img/telefonica.png)
+ content/browser/loop/shared/img/hello_logo.svg (content/shared/img/hello_logo.svg)
+ content/browser/loop/shared/img/telefonica@2x.png (content/shared/img/telefonica@2x.png)
+ content/browser/loop/shared/img/ellipsis-v.svg (content/shared/img/ellipsis-v.svg)
+ content/browser/loop/shared/img/empty_conversations.svg (content/shared/img/empty_conversations.svg)
+ content/browser/loop/shared/img/empty_search.svg (content/shared/img/empty_search.svg)
+ content/browser/loop/shared/img/animated-spinner.svg (content/shared/img/animated-spinner.svg)
+ content/browser/loop/shared/img/avatars.svg (content/shared/img/avatars.svg)
+ content/browser/loop/shared/img/firefox-avatar.svg (content/shared/img/firefox-avatar.svg)
+ content/browser/loop/shared/img/pause-12x12.svg (content/shared/img/pause-12x12.svg)
+ content/browser/loop/shared/img/play-12x12.svg (content/shared/img/play-12x12.svg)
+ content/browser/loop/shared/img/stop-12x12.svg (content/shared/img/stop-12x12.svg)
+
+ # Shared scripts
+ content/browser/loop/shared/js/actions.js (content/shared/js/actions.js)
+ content/browser/loop/shared/js/store.js (content/shared/js/store.js)
+ content/browser/loop/shared/js/activeRoomStore.js (content/shared/js/activeRoomStore.js)
+ content/browser/loop/shared/js/dispatcher.js (content/shared/js/dispatcher.js)
+ content/browser/loop/shared/js/linkifiedTextView.js (content/shared/js/linkifiedTextView.js)
+ content/browser/loop/shared/js/loopapi-client.js (content/shared/js/loopapi-client.js)
+ content/browser/loop/shared/js/models.js (content/shared/js/models.js)
+ content/browser/loop/shared/js/mixins.js (content/shared/js/mixins.js)
+ content/browser/loop/shared/js/otSdkDriver.js (content/shared/js/otSdkDriver.js)
+ content/browser/loop/shared/js/views.js (content/shared/js/views.js)
+ content/browser/loop/shared/js/textChatStore.js (content/shared/js/textChatStore.js)
+ content/browser/loop/shared/js/textChatView.js (content/shared/js/textChatView.js)
+ content/browser/loop/shared/js/urlRegExps.js (content/shared/js/urlRegExps.js)
+ content/browser/loop/shared/js/utils.js (content/shared/js/utils.js)
+ content/browser/loop/shared/js/validate.js (content/shared/js/validate.js)
+
+ # Shared libs
+#ifdef DEBUG
+ content/browser/loop/shared/libs/react-0.13.3.js (content/shared/libs/react-0.13.3.js)
+#else
+ content/browser/loop/shared/libs/react-0.13.3.js (content/shared/libs/react-0.13.3-prod.js)
+#endif
+ content/browser/loop/shared/libs/lodash-3.9.3.js (content/shared/libs/lodash-3.9.3.js)
+ content/browser/loop/shared/libs/backbone-1.2.1.js (content/shared/libs/backbone-1.2.1.js)
+ content/browser/loop/shared/libs/classnames-2.2.0.js (content/shared/libs/classnames-2.2.0.js)
+
+ # Shared sounds
+ content/browser/loop/shared/sounds/ringtone.ogg (content/shared/sounds/ringtone.ogg)
+ content/browser/loop/shared/sounds/connecting.ogg (content/shared/sounds/connecting.ogg)
+ content/browser/loop/shared/sounds/connected.ogg (content/shared/sounds/connected.ogg)
+ content/browser/loop/shared/sounds/terminated.ogg (content/shared/sounds/terminated.ogg)
+ content/browser/loop/shared/sounds/room-joined.ogg (content/shared/sounds/room-joined.ogg)
+ content/browser/loop/shared/sounds/room-joined-in.ogg (content/shared/sounds/room-joined-in.ogg)
+ content/browser/loop/shared/sounds/room-left.ogg (content/shared/sounds/room-left.ogg)
+ content/browser/loop/shared/sounds/failure.ogg (content/shared/sounds/failure.ogg)
+ content/browser/loop/shared/sounds/message.ogg (content/shared/sounds/message.ogg)
+
+ # Partner SDK assets
+ content/browser/loop/libs/sdk.js (content/shared/libs/sdk.js)
+ content/browser/loop/sdk-content/js/dynamic_config.min.js (content/shared/libs/sdk-content/js/dynamic_config.min.js)
diff --git a/browser/extensions/loop/manifest.ini b/browser/components/loop/manifest.ini
similarity index 100%
rename from browser/extensions/loop/manifest.ini
rename to browser/components/loop/manifest.ini
diff --git a/browser/components/loop/modules/.eslintrc b/browser/components/loop/modules/.eslintrc
new file mode 100644
index 000000000000..de960d6e5eec
--- /dev/null
+++ b/browser/components/loop/modules/.eslintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "../.eslintrc-gecko"
+}
diff --git a/browser/extensions/loop/content/modules/LoopRooms.jsm b/browser/components/loop/modules/LoopRooms.jsm
similarity index 99%
rename from browser/extensions/loop/content/modules/LoopRooms.jsm
rename to browser/components/loop/modules/LoopRooms.jsm
index 7665ef5e9616..22b5541e270f 100644
--- a/browser/extensions/loop/content/modules/LoopRooms.jsm
+++ b/browser/components/loop/modules/LoopRooms.jsm
@@ -10,7 +10,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Task.jsm");
Cu.import("resource://gre/modules/Timer.jsm");
-const { MozLoopService, LOOP_SESSION_TYPE } = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+const { MozLoopService, LOOP_SESSION_TYPE } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
"resource://gre/modules/Promise.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
@@ -27,11 +27,11 @@ XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {
});
XPCOMUtils.defineLazyModuleGetter(this, "LoopRoomsCache",
- "chrome://loop/content/modules/LoopRoomsCache.jsm");
+ "resource:///modules/loop/LoopRoomsCache.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "loopUtils",
- "chrome://loop/content/modules/utils.js", "utils");
+ "resource:///modules/loop/utils.js", "utils");
XPCOMUtils.defineLazyModuleGetter(this, "loopCrypto",
- "chrome://loop/content/shared/js/crypto.js", "LoopCrypto");
+ "resource:///modules/loop/crypto.js", "LoopCrypto");
XPCOMUtils.defineLazyModuleGetter(this, "ObjectUtils",
"resource://gre/modules/ObjectUtils.jsm");
diff --git a/browser/extensions/loop/content/modules/LoopRoomsCache.jsm b/browser/components/loop/modules/LoopRoomsCache.jsm
similarity index 98%
rename from browser/extensions/loop/content/modules/LoopRoomsCache.jsm
rename to browser/components/loop/modules/LoopRoomsCache.jsm
index de123d2e3d6b..f1265a6611b6 100644
--- a/browser/extensions/loop/content/modules/LoopRoomsCache.jsm
+++ b/browser/components/loop/modules/LoopRoomsCache.jsm
@@ -9,7 +9,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Task.jsm");
const { MozLoopService, LOOP_SESSION_TYPE } =
- Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+ Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
"resource://services-common/utils.js");
XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
diff --git a/browser/extensions/loop/content/modules/MozLoopAPI.jsm b/browser/components/loop/modules/MozLoopAPI.jsm
similarity index 99%
rename from browser/extensions/loop/content/modules/MozLoopAPI.jsm
rename to browser/components/loop/modules/MozLoopAPI.jsm
index 49f4a30b2604..70638ee9fe3e 100644
--- a/browser/extensions/loop/content/modules/MozLoopAPI.jsm
+++ b/browser/components/loop/modules/MozLoopAPI.jsm
@@ -9,8 +9,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://services-common/utils.js");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("chrome://loop/content/modules/MozLoopService.jsm");
-Cu.import("chrome://loop/content/modules/LoopRooms.jsm");
+Cu.import("resource:///modules/loop/MozLoopService.jsm");
+Cu.import("resource:///modules/loop/LoopRooms.jsm");
Cu.importGlobalProperties(["Blob"]);
XPCOMUtils.defineLazyModuleGetter(this, "PageMetadata",
diff --git a/browser/extensions/loop/content/modules/MozLoopPushHandler.jsm b/browser/components/loop/modules/MozLoopPushHandler.jsm
similarity index 99%
rename from browser/extensions/loop/content/modules/MozLoopPushHandler.jsm
rename to browser/components/loop/modules/MozLoopPushHandler.jsm
index cb10cea3f6ad..8be93ff80f7c 100644
--- a/browser/extensions/loop/content/modules/MozLoopPushHandler.jsm
+++ b/browser/components/loop/modules/MozLoopPushHandler.jsm
@@ -10,7 +10,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Timer.jsm");
-const { MozLoopService } = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+const { MozLoopService } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
const consoleLog = MozLoopService.log;
this.EXPORTED_SYMBOLS = ["MozLoopPushHandler"];
diff --git a/browser/extensions/loop/content/modules/MozLoopService.jsm b/browser/components/loop/modules/MozLoopService.jsm
similarity index 99%
rename from browser/extensions/loop/content/modules/MozLoopService.jsm
rename to browser/components/loop/modules/MozLoopService.jsm
index 43e3c5609370..15c8bae30773 100644
--- a/browser/extensions/loop/content/modules/MozLoopService.jsm
+++ b/browser/components/loop/modules/MozLoopService.jsm
@@ -121,14 +121,14 @@ XPCOMUtils.defineConstant(this, "ROOM_DELETE", ROOM_DELETE);
XPCOMUtils.defineConstant(this, "ROOM_CONTEXT_ADD", ROOM_CONTEXT_ADD);
XPCOMUtils.defineLazyModuleGetter(this, "LoopAPI",
- "chrome://loop/content/modules/MozLoopAPI.jsm");
+ "resource:///modules/loop/MozLoopAPI.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "convertToRTCStatsReport",
"resource://gre/modules/media/RTCStatsReport.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "loopUtils",
- "chrome://loop/content/modules/utils.js", "utils");
+ "resource:///modules/loop/utils.js", "utils");
XPCOMUtils.defineLazyModuleGetter(this, "loopCrypto",
- "chrome://loop/content/shared/js/crypto.js", "LoopCrypto");
+ "resource:///modules/loop/crypto.js", "LoopCrypto");
XPCOMUtils.defineLazyModuleGetter(this, "Chat", "resource:///modules/Chat.jsm");
@@ -151,13 +151,13 @@ XPCOMUtils.defineLazyModuleGetter(this, "hookWindowCloseForPanelClose",
"resource://gre/modules/MozSocialAPI.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "LoopRooms",
- "chrome://loop/content/modules/LoopRooms.jsm");
+ "resource:///modules/loop/LoopRooms.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "roomsPushNotification",
- "chrome://loop/content/modules/LoopRooms.jsm");
+ "resource:///modules/loop/LoopRooms.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "MozLoopPushHandler",
- "chrome://loop/content/modules/MozLoopPushHandler.jsm");
+ "resource:///modules/loop/MozLoopPushHandler.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "UITour",
"resource:///modules/UITour.jsm");
diff --git a/browser/extensions/loop/content/modules/MozLoopWorker.js b/browser/components/loop/modules/MozLoopWorker.js
similarity index 100%
rename from browser/extensions/loop/content/modules/MozLoopWorker.js
rename to browser/components/loop/modules/MozLoopWorker.js
diff --git a/browser/extensions/loop/moz.build b/browser/components/loop/moz.build
similarity index 64%
rename from browser/extensions/loop/moz.build
rename to browser/components/loop/moz.build
index f53a007a2cab..b76d562ec638 100644
--- a/browser/extensions/loop/moz.build
+++ b/browser/components/loop/moz.build
@@ -4,16 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-FINAL_TARGET = 'dist/bin/browser/features/loop@mozilla.org'
-
-FINAL_TARGET_FILES += [
- 'bootstrap.js'
-]
-
-DIST_FILES += [
- 'install.rdf.in'
-]
-
JAR_MANIFESTS += ['jar.mn']
XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
@@ -22,5 +12,16 @@ BROWSER_CHROME_MANIFESTS += [
'test/mochitest/browser.ini',
]
+EXTRA_JS_MODULES.loop += [
+ 'content/shared/js/crypto.js',
+ 'content/shared/js/utils.js',
+ 'modules/LoopRooms.jsm',
+ 'modules/LoopRoomsCache.jsm',
+ 'modules/MozLoopAPI.jsm',
+ 'modules/MozLoopPushHandler.jsm',
+ 'modules/MozLoopService.jsm',
+ 'modules/MozLoopWorker.js',
+]
+
with Files('**'):
BUG_COMPONENT = ('Loop', 'Client')
diff --git a/browser/extensions/loop/run-all-loop-tests.sh b/browser/components/loop/run-all-loop-tests.sh
similarity index 94%
rename from browser/extensions/loop/run-all-loop-tests.sh
rename to browser/components/loop/run-all-loop-tests.sh
index dee165708fc5..2628c0b1aed2 100755
--- a/browser/extensions/loop/run-all-loop-tests.sh
+++ b/browser/components/loop/run-all-loop-tests.sh
@@ -12,7 +12,7 @@ set -e
# Main tests
-LOOPDIR=browser/extensions/loop
+LOOPDIR=browser/components/loop
ESLINT=standalone/node_modules/.bin/eslint
if [ -x "${LOOPDIR}/${ESLINT}" ]; then
echo 'running eslint; see http://eslint.org/docs/rules/ for error info'
@@ -25,7 +25,7 @@ fi
# Build tests coverage.
MISSINGDEPSMSG="\nMake sure all dependencies are up to date by running
-'npm install' inside the 'browser/extensions/loop/test/' directory.\n"
+'npm install' inside the 'browser/components/loop/test/' directory.\n"
(
cd ${LOOPDIR}/test
if ! npm run-script build-coverage ; then
diff --git a/browser/extensions/loop/standalone/.gitignore b/browser/components/loop/standalone/.gitignore
similarity index 100%
rename from browser/extensions/loop/standalone/.gitignore
rename to browser/components/loop/standalone/.gitignore
diff --git a/browser/extensions/loop/standalone/Makefile b/browser/components/loop/standalone/Makefile
similarity index 100%
rename from browser/extensions/loop/standalone/Makefile
rename to browser/components/loop/standalone/Makefile
diff --git a/browser/extensions/loop/standalone/README.md b/browser/components/loop/standalone/README.md
similarity index 100%
rename from browser/extensions/loop/standalone/README.md
rename to browser/components/loop/standalone/README.md
diff --git a/browser/extensions/loop/standalone/content/css/webapp.css b/browser/components/loop/standalone/content/css/webapp.css
similarity index 97%
rename from browser/extensions/loop/standalone/content/css/webapp.css
rename to browser/components/loop/standalone/content/css/webapp.css
index 525608decf9b..bc46ed3d9e9d 100644
--- a/browser/extensions/loop/standalone/content/css/webapp.css
+++ b/browser/components/loop/standalone/content/css/webapp.css
@@ -87,7 +87,7 @@ html[dir="rtl"] .standalone-overlay-wrapper > .general-support-url {
background-size: contain;
width: 16px;
height: 16px;
- background: transparent url("../shared/img/glyph-help-16x16.svg") no-repeat;
+ background: transparent url("../shared/img/svg/glyph-help-16x16.svg") no-repeat;
}
.standalone-overlay-wrapper > .standalone-moz-logo {
@@ -271,7 +271,7 @@ html[dir="rtl"] .standalone-overlay-wrapper > .standalone-moz-logo {
}
.room-inner-info-area > .room-waiting-area > a >.room-waiting-help {
- background: transparent url("../shared/img/glyph-help-16x16.svg") no-repeat;
+ background: transparent url("../shared/img/svg/glyph-help-16x16.svg") no-repeat;
display: inline-block;
height: 16px;
margin-left: 5px;
diff --git a/browser/extensions/loop/standalone/content/favicon.ico b/browser/components/loop/standalone/content/favicon.ico
similarity index 100%
rename from browser/extensions/loop/standalone/content/favicon.ico
rename to browser/components/loop/standalone/content/favicon.ico
diff --git a/browser/extensions/loop/standalone/content/img/gum-chrome.svg b/browser/components/loop/standalone/content/img/gum-chrome.svg
similarity index 100%
rename from browser/extensions/loop/standalone/content/img/gum-chrome.svg
rename to browser/components/loop/standalone/content/img/gum-chrome.svg
diff --git a/browser/extensions/loop/standalone/content/img/gum-firefox.svg b/browser/components/loop/standalone/content/img/gum-firefox.svg
similarity index 100%
rename from browser/extensions/loop/standalone/content/img/gum-firefox.svg
rename to browser/components/loop/standalone/content/img/gum-firefox.svg
diff --git a/browser/extensions/loop/standalone/content/img/gum-opera.svg b/browser/components/loop/standalone/content/img/gum-opera.svg
similarity index 100%
rename from browser/extensions/loop/standalone/content/img/gum-opera.svg
rename to browser/components/loop/standalone/content/img/gum-opera.svg
diff --git a/browser/extensions/loop/standalone/content/img/gum-others.svg b/browser/components/loop/standalone/content/img/gum-others.svg
similarity index 100%
rename from browser/extensions/loop/standalone/content/img/gum-others.svg
rename to browser/components/loop/standalone/content/img/gum-others.svg
diff --git a/browser/extensions/loop/standalone/content/img/hello-logo-text.svg b/browser/components/loop/standalone/content/img/hello-logo-text.svg
similarity index 100%
rename from browser/extensions/loop/standalone/content/img/hello-logo-text.svg
rename to browser/components/loop/standalone/content/img/hello-logo-text.svg
diff --git a/browser/extensions/loop/standalone/content/img/logo.png b/browser/components/loop/standalone/content/img/logo.png
similarity index 100%
rename from browser/extensions/loop/standalone/content/img/logo.png
rename to browser/components/loop/standalone/content/img/logo.png
diff --git a/browser/extensions/loop/standalone/content/img/mozilla-logo.svg b/browser/components/loop/standalone/content/img/mozilla-logo.svg
similarity index 100%
rename from browser/extensions/loop/standalone/content/img/mozilla-logo.svg
rename to browser/components/loop/standalone/content/img/mozilla-logo.svg
diff --git a/browser/extensions/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
similarity index 100%
rename from browser/extensions/loop/standalone/content/index.html
rename to browser/components/loop/standalone/content/index.html
diff --git a/browser/extensions/loop/standalone/content/js/standaloneAppStore.js b/browser/components/loop/standalone/content/js/standaloneAppStore.js
similarity index 100%
rename from browser/extensions/loop/standalone/content/js/standaloneAppStore.js
rename to browser/components/loop/standalone/content/js/standaloneAppStore.js
diff --git a/browser/extensions/loop/standalone/content/js/standaloneMetricsStore.js b/browser/components/loop/standalone/content/js/standaloneMetricsStore.js
similarity index 100%
rename from browser/extensions/loop/standalone/content/js/standaloneMetricsStore.js
rename to browser/components/loop/standalone/content/js/standaloneMetricsStore.js
diff --git a/browser/extensions/loop/standalone/content/js/standaloneMozLoop.js b/browser/components/loop/standalone/content/js/standaloneMozLoop.js
similarity index 100%
rename from browser/extensions/loop/standalone/content/js/standaloneMozLoop.js
rename to browser/components/loop/standalone/content/js/standaloneMozLoop.js
diff --git a/browser/extensions/loop/standalone/content/js/standaloneRoomViews.js b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
similarity index 100%
rename from browser/extensions/loop/standalone/content/js/standaloneRoomViews.js
rename to browser/components/loop/standalone/content/js/standaloneRoomViews.js
diff --git a/browser/extensions/loop/standalone/content/js/standaloneRoomViews.jsx b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
similarity index 100%
rename from browser/extensions/loop/standalone/content/js/standaloneRoomViews.jsx
rename to browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
diff --git a/browser/extensions/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
similarity index 100%
rename from browser/extensions/loop/standalone/content/js/webapp.js
rename to browser/components/loop/standalone/content/js/webapp.js
diff --git a/browser/extensions/loop/standalone/content/js/webapp.jsx b/browser/components/loop/standalone/content/js/webapp.jsx
similarity index 100%
rename from browser/extensions/loop/standalone/content/js/webapp.jsx
rename to browser/components/loop/standalone/content/js/webapp.jsx
diff --git a/browser/extensions/loop/standalone/content/l10n/en-US/loop.properties b/browser/components/loop/standalone/content/l10n/en-US/loop.properties
similarity index 100%
rename from browser/extensions/loop/standalone/content/l10n/en-US/loop.properties
rename to browser/components/loop/standalone/content/l10n/en-US/loop.properties
diff --git a/browser/extensions/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js b/browser/components/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
similarity index 100%
rename from browser/extensions/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
rename to browser/components/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
diff --git a/browser/extensions/loop/standalone/content/libs/l10n-gaia-upstream.txt b/browser/components/loop/standalone/content/libs/l10n-gaia-upstream.txt
similarity index 100%
rename from browser/extensions/loop/standalone/content/libs/l10n-gaia-upstream.txt
rename to browser/components/loop/standalone/content/libs/l10n-gaia-upstream.txt
diff --git a/browser/extensions/loop/standalone/content/robots.txt b/browser/components/loop/standalone/content/robots.txt
similarity index 100%
rename from browser/extensions/loop/standalone/content/robots.txt
rename to browser/components/loop/standalone/content/robots.txt
diff --git a/browser/extensions/loop/standalone/content/webappEntryPoint.js b/browser/components/loop/standalone/content/webappEntryPoint.js
similarity index 93%
rename from browser/extensions/loop/standalone/content/webappEntryPoint.js
rename to browser/components/loop/standalone/content/webappEntryPoint.js
index 526e3708fe6f..73f7eeec03ce 100644
--- a/browser/extensions/loop/standalone/content/webappEntryPoint.js
+++ b/browser/components/loop/standalone/content/webappEntryPoint.js
@@ -17,20 +17,20 @@
// The OpenTok SDK tries to do some heuristic detection of require and
// assumes a node environment if it's present, which confuses webpack, so
// we turn that off by forcing require to false in that context.
-require("imports?require=>false!shared/vendor/sdk.js");
+require("imports?require=>false!shared/libs/sdk.js");
// Ultimately, we'll likely want to pull the vendor libraries from npm, as that
// makes upgrading easier, and it's generally better practice to minify the
// "source" versions of libraries rather than built artifacts. We probably do
// want to minify them ourselves since this allows for better dead-code
// elimination, but that can be a bit of judgement call.
-require("exports?_!shared/vendor/lodash-3.9.3.js");
+require("exports?_!shared/libs/lodash-3.9.3.js");
// Disable Backbone's AMD auto-detection, as described at:
//
// https://github.com/jashkenas/backbone/wiki/Using-Backbone-without-jQuery
//
-require("expose?Backbone!imports?define=>false!shared/vendor/backbone-1.2.1.js");
+require("expose?Backbone!imports?define=>false!shared/libs/backbone-1.2.1.js");
/* global: __PROD__ */
if (typeof __PROD__ !== "undefined") {
@@ -41,8 +41,8 @@ if (typeof __PROD__ !== "undefined") {
require("expose?classNames!classnames");
} else {
// our development server setup doesn't yet handle real modules, so for now...
- require("shared/vendor/react-0.13.3.js");
- require("shared/vendor/classnames-2.2.0.js");
+ require("shared/libs/react-0.13.3.js");
+ require("shared/libs/classnames-2.2.0.js");
}
diff --git a/browser/extensions/loop/standalone/package.json b/browser/components/loop/standalone/package.json
similarity index 100%
rename from browser/extensions/loop/standalone/package.json
rename to browser/components/loop/standalone/package.json
diff --git a/browser/extensions/loop/standalone/server.js b/browser/components/loop/standalone/server.js
similarity index 95%
rename from browser/extensions/loop/standalone/server.js
rename to browser/components/loop/standalone/server.js
index 3c6cb09f4b40..5c178c34ea7f 100644
--- a/browser/extensions/loop/standalone/server.js
+++ b/browser/components/loop/standalone/server.js
@@ -90,10 +90,6 @@ app.use("/content/c", express.static(path.join(__dirname, "..", "content")));
// Two lines for the same reason as /content above.
app.use("/test", express.static(path.join(__dirname, "test")));
app.use("/test", express.static(path.join(__dirname, "..", "test")));
-// Hacks for desktop to stop errors being raised in the tests for content loading.
-app.use("/test/shared/shared", express.static(path.join(__dirname, "..", "content/shared")));
-app.use("/test/desktop-local/shared", express.static(path.join(__dirname, "..", "content/shared")));
-
// As we don't have hashes on the urls, the best way to serve the index files
// appears to be to be to closely filter the url and match appropriately.
diff --git a/browser/extensions/loop/standalone/webpack.config.js b/browser/components/loop/standalone/webpack.config.js
similarity index 100%
rename from browser/extensions/loop/standalone/webpack.config.js
rename to browser/components/loop/standalone/webpack.config.js
diff --git a/browser/extensions/loop/test/.eslintrc b/browser/components/loop/test/.eslintrc
similarity index 100%
rename from browser/extensions/loop/test/.eslintrc
rename to browser/components/loop/test/.eslintrc
diff --git a/browser/extensions/loop/test/coverage/index.html b/browser/components/loop/test/coverage/index.html
similarity index 100%
rename from browser/extensions/loop/test/coverage/index.html
rename to browser/components/loop/test/coverage/index.html
diff --git a/browser/extensions/loop/test/desktop-local/.eslintrc b/browser/components/loop/test/desktop-local/.eslintrc
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/.eslintrc
rename to browser/components/loop/test/desktop-local/.eslintrc
diff --git a/browser/extensions/loop/test/desktop-local/README.md b/browser/components/loop/test/desktop-local/README.md
similarity index 89%
rename from browser/extensions/loop/test/desktop-local/README.md
rename to browser/components/loop/test/desktop-local/README.md
index 43dc73c5c315..5f459e32fc4a 100644
--- a/browser/extensions/loop/test/desktop-local/README.md
+++ b/browser/components/loop/test/desktop-local/README.md
@@ -11,7 +11,7 @@ a file: or HTTP URL to run the tests. Alternately, from the top-level of your
Gecko source directory, execute:
```
-./mach marionette-test browser/extensions/loop/test/manifest.ini
+./mach marionette-test browser/components/loop/test/manifest.ini
```
Next steps:
diff --git a/browser/extensions/loop/test/desktop-local/conversationAppStore_test.js b/browser/components/loop/test/desktop-local/conversationAppStore_test.js
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/conversationAppStore_test.js
rename to browser/components/loop/test/desktop-local/conversationAppStore_test.js
diff --git a/browser/extensions/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/conversation_test.js
rename to browser/components/loop/test/desktop-local/conversation_test.js
diff --git a/browser/extensions/loop/test/desktop-local/feedbackViews_test.js b/browser/components/loop/test/desktop-local/feedbackViews_test.js
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/feedbackViews_test.js
rename to browser/components/loop/test/desktop-local/feedbackViews_test.js
diff --git a/browser/extensions/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
similarity index 77%
rename from browser/extensions/loop/test/desktop-local/index.html
rename to browser/components/loop/test/desktop-local/index.html
index f434148925e3..d5108f264576 100644
--- a/browser/extensions/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -14,17 +14,17 @@
-
+
-
-
-
-
+
+
+
+
@@ -50,12 +50,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/browser/extensions/loop/test/desktop-local/l10n_test.js b/browser/components/loop/test/desktop-local/l10n_test.js
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/l10n_test.js
rename to browser/components/loop/test/desktop-local/l10n_test.js
diff --git a/browser/extensions/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/panel_test.js
rename to browser/components/loop/test/desktop-local/panel_test.js
diff --git a/browser/extensions/loop/test/desktop-local/roomStore_test.js b/browser/components/loop/test/desktop-local/roomStore_test.js
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/roomStore_test.js
rename to browser/components/loop/test/desktop-local/roomStore_test.js
diff --git a/browser/extensions/loop/test/desktop-local/roomViews_test.js b/browser/components/loop/test/desktop-local/roomViews_test.js
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/roomViews_test.js
rename to browser/components/loop/test/desktop-local/roomViews_test.js
diff --git a/browser/extensions/loop/test/desktop-local/test_desktop_all.py b/browser/components/loop/test/desktop-local/test_desktop_all.py
similarity index 100%
rename from browser/extensions/loop/test/desktop-local/test_desktop_all.py
rename to browser/components/loop/test/desktop-local/test_desktop_all.py
diff --git a/browser/extensions/loop/test/functional/config.py b/browser/components/loop/test/functional/config.py
similarity index 100%
rename from browser/extensions/loop/test/functional/config.py
rename to browser/components/loop/test/functional/config.py
diff --git a/browser/extensions/loop/test/functional/hanging_threads.py b/browser/components/loop/test/functional/hanging_threads.py
similarity index 100%
rename from browser/extensions/loop/test/functional/hanging_threads.py
rename to browser/components/loop/test/functional/hanging_threads.py
diff --git a/browser/extensions/loop/test/functional/manifest.ini b/browser/components/loop/test/functional/manifest.ini
similarity index 100%
rename from browser/extensions/loop/test/functional/manifest.ini
rename to browser/components/loop/test/functional/manifest.ini
diff --git a/browser/extensions/loop/test/functional/serversetup.py b/browser/components/loop/test/functional/serversetup.py
similarity index 100%
rename from browser/extensions/loop/test/functional/serversetup.py
rename to browser/components/loop/test/functional/serversetup.py
diff --git a/browser/extensions/loop/test/functional/test_1_browser_call.py b/browser/components/loop/test/functional/test_1_browser_call.py
similarity index 100%
rename from browser/extensions/loop/test/functional/test_1_browser_call.py
rename to browser/components/loop/test/functional/test_1_browser_call.py
diff --git a/browser/extensions/loop/test/index.html b/browser/components/loop/test/index.html
similarity index 100%
rename from browser/extensions/loop/test/index.html
rename to browser/components/loop/test/index.html
diff --git a/browser/extensions/loop/test/karma/head.js b/browser/components/loop/test/karma/head.js
similarity index 100%
rename from browser/extensions/loop/test/karma/head.js
rename to browser/components/loop/test/karma/head.js
diff --git a/browser/extensions/loop/test/karma/karma.conf.base.js b/browser/components/loop/test/karma/karma.conf.base.js
similarity index 100%
rename from browser/extensions/loop/test/karma/karma.conf.base.js
rename to browser/components/loop/test/karma/karma.conf.base.js
diff --git a/browser/extensions/loop/test/karma/karma.coverage.desktop.js b/browser/components/loop/test/karma/karma.coverage.desktop.js
similarity index 75%
rename from browser/extensions/loop/test/karma/karma.coverage.desktop.js
rename to browser/components/loop/test/karma/karma.coverage.desktop.js
index 67f43865cf92..6863e06041e7 100644
--- a/browser/extensions/loop/test/karma/karma.coverage.desktop.js
+++ b/browser/components/loop/test/karma/karma.coverage.desktop.js
@@ -10,11 +10,11 @@ module.exports = function(config) {
// List of files / patterns to load in the browser.
baseConfig.files = baseConfig.files.concat([
- "content/panels/vendor/l10n.js",
- "content/shared/vendor/react-0.13.3.js",
- "content/shared/vendor/classnames-2.2.0.js",
- "content/shared/vendor/lodash-3.9.3.js",
- "content/shared/vendor/backbone-1.2.1.js",
+ "content/libs/l10n.js",
+ "content/shared/libs/react-0.13.3.js",
+ "content/shared/libs/classnames-2.2.0.js",
+ "content/shared/libs/lodash-3.9.3.js",
+ "content/shared/libs/backbone-1.2.1.js",
"test/shared/vendor/*.js",
"test/shared/loop_mocha_utils.js",
"test/karma/head.js", // Stub out DOM event listener due to races.
@@ -31,11 +31,11 @@ module.exports = function(config) {
"content/shared/js/views.js",
"content/shared/js/textChatStore.js",
"content/shared/js/textChatView.js",
- "content/panels/js/feedbackViews.js",
- "content/panels/js/conversationAppStore.js",
- "content/panels/js/roomStore.js",
- "content/panels/js/roomViews.js",
- "content/panels/js/conversation.js",
+ "content/js/feedbackViews.js",
+ "content/js/conversationAppStore.js",
+ "content/js/roomStore.js",
+ "content/js/roomViews.js",
+ "content/js/conversation.js",
"test/desktop-local/*.js"
]);
@@ -47,7 +47,7 @@ module.exports = function(config) {
// Preprocess matching files before serving them to the browser.
// Available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor .
baseConfig.preprocessors = {
- "content/panels/js/*.js": ["coverage"]
+ "content/js/*.js": ["coverage"]
};
baseConfig.coverageReporter.dir = "test/coverage/desktop";
diff --git a/browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js b/browser/components/loop/test/karma/karma.coverage.shared_standalone.js
similarity index 89%
rename from browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
rename to browser/components/loop/test/karma/karma.coverage.shared_standalone.js
index 299c44f2185d..7bd346cbf178 100644
--- a/browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
+++ b/browser/components/loop/test/karma/karma.coverage.shared_standalone.js
@@ -11,11 +11,11 @@ module.exports = function(config) {
// List of files / patterns to load in the browser.
baseConfig.files = baseConfig.files.concat([
"standalone/content/libs/l10n-gaia-02ca67948fe8.js",
- "content/shared/vendor/lodash-3.9.3.js",
- "content/shared/vendor/backbone-1.2.1.js",
- "content/shared/vendor/react-0.13.3.js",
- "content/shared/vendor/classnames-2.2.0.js",
- "content/shared/vendor/sdk.js",
+ "content/shared/libs/lodash-3.9.3.js",
+ "content/shared/libs/backbone-1.2.1.js",
+ "content/shared/libs/react-0.13.3.js",
+ "content/shared/libs/classnames-2.2.0.js",
+ "content/shared/libs/sdk.js",
"test/shared/vendor/*.js",
"test/shared/loop_mocha_utils.js",
"test/karma/head.js", // Add test fixture container
diff --git a/browser/extensions/loop/test/mochitest/.eslintrc b/browser/components/loop/test/mochitest/.eslintrc
similarity index 100%
rename from browser/extensions/loop/test/mochitest/.eslintrc
rename to browser/components/loop/test/mochitest/.eslintrc
diff --git a/browser/extensions/loop/test/mochitest/browser.ini b/browser/components/loop/test/mochitest/browser.ini
similarity index 100%
rename from browser/extensions/loop/test/mochitest/browser.ini
rename to browser/components/loop/test/mochitest/browser.ini
diff --git a/browser/extensions/loop/test/mochitest/browser_LoopRooms_channel.js b/browser/components/loop/test/mochitest/browser_LoopRooms_channel.js
similarity index 98%
rename from browser/extensions/loop/test/mochitest/browser_LoopRooms_channel.js
rename to browser/components/loop/test/mochitest/browser_LoopRooms_channel.js
index 0ef65728b599..ae693218ebc9 100644
--- a/browser/extensions/loop/test/mochitest/browser_LoopRooms_channel.js
+++ b/browser/components/loop/test/mochitest/browser_LoopRooms_channel.js
@@ -12,7 +12,7 @@ var { WebChannel } = Cu.import("resource://gre/modules/WebChannel.jsm", {});
var { Chat } = Cu.import("resource:///modules/Chat.jsm", {});
const TEST_URI =
- "example.com/browser/browser/extensions/loop/test/mochitest/test_loopLinkClicker_channel.html";
+ "example.com/browser/browser/components/loop/test/mochitest/test_loopLinkClicker_channel.html";
const TEST_URI_GOOD = Services.io.newURI("https://" + TEST_URI, null, null);
const TEST_URI_BAD = Services.io.newURI("http://" + TEST_URI, null, null);
diff --git a/browser/extensions/loop/test/mochitest/browser_fxa_login.js b/browser/components/loop/test/mochitest/browser_fxa_login.js
similarity index 99%
rename from browser/extensions/loop/test/mochitest/browser_fxa_login.js
rename to browser/components/loop/test/mochitest/browser_fxa_login.js
index 0d5e359aff27..9036c06ad98d 100644
--- a/browser/extensions/loop/test/mochitest/browser_fxa_login.js
+++ b/browser/components/loop/test/mochitest/browser_fxa_login.js
@@ -8,7 +8,7 @@
"use strict";
const BASE_URL = Services.prefs.getCharPref("loop.server");
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
function* checkFxA401() {
let err = MozLoopService.errors.get("login");
diff --git a/browser/extensions/loop/test/mochitest/browser_loop_fxa_server.js b/browser/components/loop/test/mochitest/browser_loop_fxa_server.js
similarity index 97%
rename from browser/extensions/loop/test/mochitest/browser_loop_fxa_server.js
rename to browser/components/loop/test/mochitest/browser_loop_fxa_server.js
index 62c30531b6ad..ae7f6eeaee1e 100644
--- a/browser/extensions/loop/test/mochitest/browser_loop_fxa_server.js
+++ b/browser/components/loop/test/mochitest/browser_loop_fxa_server.js
@@ -7,7 +7,7 @@
"use strict";
-const BASE_URL = "http://mochi.test:8888/browser/browser/extensions/loop/test/mochitest/loop_fxa.sjs?";
+const BASE_URL = "http://mochi.test:8888/browser/browser/components/loop/test/mochitest/loop_fxa.sjs?";
registerCleanupFunction(function* () {
yield promiseDeletedOAuthParams(BASE_URL);
diff --git a/browser/extensions/loop/test/mochitest/browser_mozLoop_appVersionInfo.js b/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
similarity index 92%
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
index 6c96ebef236b..5528f9036dd5 100644
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
@@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
var [, gHandlers] = LoopAPI.inspect();
add_task(function* test_mozLoop_appVersionInfo() {
diff --git a/browser/extensions/loop/test/mochitest/browser_mozLoop_chat.js b/browser/components/loop/test/mochitest/browser_mozLoop_chat.js
similarity index 100%
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_chat.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_chat.js
diff --git a/browser/extensions/loop/test/mochitest/browser_mozLoop_context.js b/browser/components/loop/test/mochitest/browser_mozLoop_context.js
similarity index 96%
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_context.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_context.js
index 424de044dbf8..e5b3bd9563b3 100644
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_context.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_context.js
@@ -7,7 +7,7 @@
*/
"use strict";
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
var [, gHandlers] = LoopAPI.inspect();
function promiseGetMetadata() {
diff --git a/browser/extensions/loop/test/mochitest/browser_mozLoop_sharingListeners.js b/browser/components/loop/test/mochitest/browser_mozLoop_sharingListeners.js
similarity index 98%
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_sharingListeners.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_sharingListeners.js
index 78aa1428199b..04dc02256089 100644
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_sharingListeners.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_sharingListeners.js
@@ -6,7 +6,7 @@
*/
"use strict";
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
var [, gHandlers] = LoopAPI.inspect();
var handlers = [
diff --git a/browser/extensions/loop/test/mochitest/browser_mozLoop_socialShare.js b/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
similarity index 98%
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_socialShare.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
index 21c416962d20..0347ed9d936c 100644
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_socialShare.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
@@ -4,7 +4,7 @@
Cu.import("resource://gre/modules/Promise.jsm");
const { SocialService } = Cu.import("resource://gre/modules/SocialService.jsm", {});
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
var [, gHandlers] = LoopAPI.inspect();
diff --git a/browser/extensions/loop/test/mochitest/browser_mozLoop_telemetry.js b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
similarity index 98%
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_telemetry.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
index 7a2b42190613..8746c2ca579a 100644
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_telemetry.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
@@ -7,7 +7,7 @@
"use strict";
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
var [, gHandlers] = LoopAPI.inspect();
var gConstants;
gHandlers.GetAllConstants({}, constants => gConstants = constants);
diff --git a/browser/extensions/loop/test/mochitest/browser_toolbarbutton.js b/browser/components/loop/test/mochitest/browser_toolbarbutton.js
similarity index 99%
rename from browser/extensions/loop/test/mochitest/browser_toolbarbutton.js
rename to browser/components/loop/test/mochitest/browser_toolbarbutton.js
index 707212e5a99c..4023ce9db724 100644
--- a/browser/extensions/loop/test/mochitest/browser_toolbarbutton.js
+++ b/browser/components/loop/test/mochitest/browser_toolbarbutton.js
@@ -8,7 +8,7 @@
"use strict";
Components.utils.import("resource://gre/modules/Promise.jsm", this);
-const { LoopRoomsInternal } = Components.utils.import("chrome://loop/content/modules/LoopRooms.jsm", {});
+const { LoopRoomsInternal } = Components.utils.import("resource:///modules/loop/LoopRooms.jsm", {});
Services.prefs.setBoolPref("loop.gettingStarted.seen", true);
const fxASampleToken = {
diff --git a/browser/extensions/loop/test/mochitest/head.js b/browser/components/loop/test/mochitest/head.js
similarity index 96%
rename from browser/extensions/loop/test/mochitest/head.js
rename to browser/components/loop/test/mochitest/head.js
index ba0315b1b919..5f6baa274fe1 100644
--- a/browser/extensions/loop/test/mochitest/head.js
+++ b/browser/components/loop/test/mochitest/head.js
@@ -8,8 +8,8 @@ const {
LOOP_SESSION_TYPE,
MozLoopServiceInternal,
MozLoopService
-} = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
-const { LoopRooms } = Cu.import("chrome://loop/content/modules/LoopRooms.jsm", {});
+} = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
+const { LoopRooms } = Cu.import("resource:///modules/loop/LoopRooms.jsm", {});
// Cache this value only once, at the beginning of a
// test run, so that it doesn't pick up the offline=true
@@ -133,7 +133,7 @@ function promiseOAuthParamsSetup(baseURL, params) {
}
function* resetFxA() {
- let global = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+ let global = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
global.gHawkClient = null;
global.gFxAOAuthClientPromise = null;
global.gFxAOAuthClient = null;
@@ -152,7 +152,7 @@ function checkFxAOAuthTokenData(aValue) {
}
function checkLoggedOutState() {
- let global = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+ let global = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
is(global.gFxAOAuthClientPromise, null, "gFxAOAuthClientPromise should be cleared");
is(MozLoopService.userProfile, null, "fxAOAuthProfile should be cleared");
is(global.gFxAOAuthClient, null, "gFxAOAuthClient should be cleared");
diff --git a/browser/extensions/loop/test/mochitest/loop_fxa.sjs b/browser/components/loop/test/mochitest/loop_fxa.sjs
similarity index 100%
rename from browser/extensions/loop/test/mochitest/loop_fxa.sjs
rename to browser/components/loop/test/mochitest/loop_fxa.sjs
diff --git a/browser/extensions/loop/test/mochitest/test_loopLinkClicker_channel.html b/browser/components/loop/test/mochitest/test_loopLinkClicker_channel.html
similarity index 100%
rename from browser/extensions/loop/test/mochitest/test_loopLinkClicker_channel.html
rename to browser/components/loop/test/mochitest/test_loopLinkClicker_channel.html
diff --git a/browser/extensions/loop/test/package.json b/browser/components/loop/test/package.json
similarity index 100%
rename from browser/extensions/loop/test/package.json
rename to browser/components/loop/test/package.json
diff --git a/browser/extensions/loop/test/shared/activeRoomStore_test.js b/browser/components/loop/test/shared/activeRoomStore_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/activeRoomStore_test.js
rename to browser/components/loop/test/shared/activeRoomStore_test.js
diff --git a/browser/extensions/loop/test/shared/crypto_test.js b/browser/components/loop/test/shared/crypto_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/crypto_test.js
rename to browser/components/loop/test/shared/crypto_test.js
diff --git a/browser/extensions/loop/test/shared/dispatcher_test.js b/browser/components/loop/test/shared/dispatcher_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/dispatcher_test.js
rename to browser/components/loop/test/shared/dispatcher_test.js
diff --git a/browser/extensions/loop/test/shared/frontend_tester.py b/browser/components/loop/test/shared/frontend_tester.py
similarity index 100%
rename from browser/extensions/loop/test/shared/frontend_tester.py
rename to browser/components/loop/test/shared/frontend_tester.py
diff --git a/browser/extensions/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
similarity index 91%
rename from browser/extensions/loop/test/shared/index.html
rename to browser/components/loop/test/shared/index.html
index 95f94ad1b1f8..6489871738e5 100644
--- a/browser/extensions/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -14,16 +14,16 @@
-
+
-
-
-
+
+
+
diff --git a/browser/extensions/loop/test/shared/linkifiedTextView_test.js b/browser/components/loop/test/shared/linkifiedTextView_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/linkifiedTextView_test.js
rename to browser/components/loop/test/shared/linkifiedTextView_test.js
diff --git a/browser/extensions/loop/test/shared/loop_mocha_utils.js b/browser/components/loop/test/shared/loop_mocha_utils.js
similarity index 100%
rename from browser/extensions/loop/test/shared/loop_mocha_utils.js
rename to browser/components/loop/test/shared/loop_mocha_utils.js
diff --git a/browser/extensions/loop/test/shared/loopapi-client_test.js b/browser/components/loop/test/shared/loopapi-client_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/loopapi-client_test.js
rename to browser/components/loop/test/shared/loopapi-client_test.js
diff --git a/browser/extensions/loop/test/shared/mixins_test.js b/browser/components/loop/test/shared/mixins_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/mixins_test.js
rename to browser/components/loop/test/shared/mixins_test.js
diff --git a/browser/extensions/loop/test/shared/models_test.js b/browser/components/loop/test/shared/models_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/models_test.js
rename to browser/components/loop/test/shared/models_test.js
diff --git a/browser/extensions/loop/test/shared/otSdkDriver_test.js b/browser/components/loop/test/shared/otSdkDriver_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/otSdkDriver_test.js
rename to browser/components/loop/test/shared/otSdkDriver_test.js
diff --git a/browser/extensions/loop/test/shared/sdk_mock.js b/browser/components/loop/test/shared/sdk_mock.js
similarity index 100%
rename from browser/extensions/loop/test/shared/sdk_mock.js
rename to browser/components/loop/test/shared/sdk_mock.js
diff --git a/browser/extensions/loop/test/shared/store_test.js b/browser/components/loop/test/shared/store_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/store_test.js
rename to browser/components/loop/test/shared/store_test.js
diff --git a/browser/extensions/loop/test/shared/test_shared_all.py b/browser/components/loop/test/shared/test_shared_all.py
similarity index 100%
rename from browser/extensions/loop/test/shared/test_shared_all.py
rename to browser/components/loop/test/shared/test_shared_all.py
diff --git a/browser/extensions/loop/test/shared/textChatStore_test.js b/browser/components/loop/test/shared/textChatStore_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/textChatStore_test.js
rename to browser/components/loop/test/shared/textChatStore_test.js
diff --git a/browser/extensions/loop/test/shared/textChatView_test.js b/browser/components/loop/test/shared/textChatView_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/textChatView_test.js
rename to browser/components/loop/test/shared/textChatView_test.js
diff --git a/browser/extensions/loop/test/shared/utils_test.js b/browser/components/loop/test/shared/utils_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/utils_test.js
rename to browser/components/loop/test/shared/utils_test.js
diff --git a/browser/extensions/loop/test/shared/validate_test.js b/browser/components/loop/test/shared/validate_test.js
similarity index 100%
rename from browser/extensions/loop/test/shared/validate_test.js
rename to browser/components/loop/test/shared/validate_test.js
diff --git a/browser/extensions/loop/test/shared/vendor/chai-3.0.0.js b/browser/components/loop/test/shared/vendor/chai-3.0.0.js
similarity index 100%
rename from browser/extensions/loop/test/shared/vendor/chai-3.0.0.js
rename to browser/components/loop/test/shared/vendor/chai-3.0.0.js
diff --git a/browser/extensions/loop/test/shared/vendor/chai-as-promised-5.1.0.js b/browser/components/loop/test/shared/vendor/chai-as-promised-5.1.0.js
similarity index 100%
rename from browser/extensions/loop/test/shared/vendor/chai-as-promised-5.1.0.js
rename to browser/components/loop/test/shared/vendor/chai-as-promised-5.1.0.js
diff --git a/browser/extensions/loop/test/shared/vendor/mocha-2.2.5.css b/browser/components/loop/test/shared/vendor/mocha-2.2.5.css
similarity index 100%
rename from browser/extensions/loop/test/shared/vendor/mocha-2.2.5.css
rename to browser/components/loop/test/shared/vendor/mocha-2.2.5.css
diff --git a/browser/extensions/loop/test/shared/vendor/mocha-2.2.5.js b/browser/components/loop/test/shared/vendor/mocha-2.2.5.js
similarity index 100%
rename from browser/extensions/loop/test/shared/vendor/mocha-2.2.5.js
rename to browser/components/loop/test/shared/vendor/mocha-2.2.5.js
diff --git a/browser/extensions/loop/test/shared/vendor/sinon-1.16.1.js b/browser/components/loop/test/shared/vendor/sinon-1.16.1.js
similarity index 100%
rename from browser/extensions/loop/test/shared/vendor/sinon-1.16.1.js
rename to browser/components/loop/test/shared/vendor/sinon-1.16.1.js
diff --git a/browser/extensions/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
similarity index 99%
rename from browser/extensions/loop/test/shared/views_test.js
rename to browser/components/loop/test/shared/views_test.js
index b71ccbcb09b3..3cf0188aeba5 100644
--- a/browser/extensions/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -840,7 +840,7 @@ describe("loop.shared.views", function() {
});
expect(view.getDOMNode().querySelector(".context-preview").getAttribute("src"))
- .eql("shared/img/icons-16x16.svg#globe");
+ .eql("loop/shared/img/icons-16x16.svg#globe");
});
it("should not display a title if by default", function() {
diff --git a/browser/extensions/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
similarity index 90%
rename from browser/extensions/loop/test/standalone/index.html
rename to browser/components/loop/test/standalone/index.html
index a8ffd06fa7a1..5af0462cf562 100644
--- a/browser/extensions/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -14,16 +14,16 @@
-
+
-
-
-
+
+
+
diff --git a/browser/extensions/loop/test/standalone/standaloneAppStore_test.js b/browser/components/loop/test/standalone/standaloneAppStore_test.js
similarity index 100%
rename from browser/extensions/loop/test/standalone/standaloneAppStore_test.js
rename to browser/components/loop/test/standalone/standaloneAppStore_test.js
diff --git a/browser/extensions/loop/test/standalone/standaloneMetricsStore_test.js b/browser/components/loop/test/standalone/standaloneMetricsStore_test.js
similarity index 100%
rename from browser/extensions/loop/test/standalone/standaloneMetricsStore_test.js
rename to browser/components/loop/test/standalone/standaloneMetricsStore_test.js
diff --git a/browser/extensions/loop/test/standalone/standaloneMozLoop_test.js b/browser/components/loop/test/standalone/standaloneMozLoop_test.js
similarity index 100%
rename from browser/extensions/loop/test/standalone/standaloneMozLoop_test.js
rename to browser/components/loop/test/standalone/standaloneMozLoop_test.js
diff --git a/browser/extensions/loop/test/standalone/standaloneRoomViews_test.js b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
similarity index 100%
rename from browser/extensions/loop/test/standalone/standaloneRoomViews_test.js
rename to browser/components/loop/test/standalone/standaloneRoomViews_test.js
diff --git a/browser/extensions/loop/test/standalone/test_standalone_all.py b/browser/components/loop/test/standalone/test_standalone_all.py
similarity index 100%
rename from browser/extensions/loop/test/standalone/test_standalone_all.py
rename to browser/components/loop/test/standalone/test_standalone_all.py
diff --git a/browser/extensions/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
similarity index 100%
rename from browser/extensions/loop/test/standalone/webapp_test.js
rename to browser/components/loop/test/standalone/webapp_test.js
diff --git a/browser/extensions/loop/test/ui-showcase/test_ui-showcase.py b/browser/components/loop/test/ui-showcase/test_ui-showcase.py
similarity index 100%
rename from browser/extensions/loop/test/ui-showcase/test_ui-showcase.py
rename to browser/components/loop/test/ui-showcase/test_ui-showcase.py
diff --git a/browser/extensions/loop/test/visual-regression/README.md b/browser/components/loop/test/visual-regression/README.md
similarity index 100%
rename from browser/extensions/loop/test/visual-regression/README.md
rename to browser/components/loop/test/visual-regression/README.md
diff --git a/browser/extensions/loop/test/visual-regression/screenshot b/browser/components/loop/test/visual-regression/screenshot
similarity index 100%
rename from browser/extensions/loop/test/visual-regression/screenshot
rename to browser/components/loop/test/visual-regression/screenshot
diff --git a/browser/extensions/loop/test/xpcshell/.eslintrc b/browser/components/loop/test/xpcshell/.eslintrc
similarity index 91%
rename from browser/extensions/loop/test/xpcshell/.eslintrc
rename to browser/components/loop/test/xpcshell/.eslintrc
index 7732b0d1ce76..e61193d5f6c3 100644
--- a/browser/extensions/loop/test/xpcshell/.eslintrc
+++ b/browser/components/loop/test/xpcshell/.eslintrc
@@ -17,7 +17,6 @@
"do_timeout": false,
"run_next_test": false,
// head.js items.
- "FileUtils": false,
"MockWebSocketChannel": false,
"extend": true,
"getLoopString": false,
@@ -28,8 +27,7 @@
"mockPushHandler": true,
"setupFakeFxAUserProfile": false,
"setupFakeLoopServer": false,
- "timerHandlers": false,
- "updateAppInfo": false,
+ "timerHandlers",
"waitForCondition": true,
// Loop specific items
"MozLoopServiceInternal": true,
diff --git a/browser/extensions/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
similarity index 79%
rename from browser/extensions/loop/test/xpcshell/head.js
rename to browser/components/loop/test/xpcshell/head.js
index 31378fafdf36..820510ce0d51 100644
--- a/browser/extensions/loop/test/xpcshell/head.js
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -10,54 +10,17 @@ do_get_profile();
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-
-// Setup the add-ons manager for this test.
-Cu.import("resource://gre/modules/FileUtils.jsm");
-
-function registerDirectory(key, dir) {
- let dirProvider = {
- getFile: function(prop, persistent) {
- persistent.value = false;
- if (prop == key) {
- return dir.clone();
- }
- return null;
- },
-
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider,
- Ci.nsISupports])
- };
- Services.dirsvc.registerProvider(dirProvider);
-}
-
-// As we're not running in application, we need to setup the features directory
-// manually.
-const distroDir = FileUtils.getDir("GreD", ["browser", "features"], true);
-registerDirectory("XREAppFeat", distroDir);
-
-// Set up application info - xpcshell doesn't have this by default.
-Cu.import("resource://testing-common/AppInfo.jsm");
-updateAppInfo();
-
-// Now trigger the addons-startup, and hence startup the manager itself. This
-// should load the manager correctly.
-var gInternalManager = Cc["@mozilla.org/addons/integration;1"]
- .getService(Ci.nsIObserver)
- .QueryInterface(Ci.nsITimerCallback);
-
-gInternalManager.observe(null, "addons-startup", null);
-
Cu.import("resource://gre/modules/Http.jsm");
Cu.import("resource://testing-common/httpd.js");
-Cu.import("chrome://loop/content/modules/MozLoopService.jsm");
+Cu.import("resource:///modules/loop/MozLoopService.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
-Cu.import("chrome://loop/content/modules/LoopRooms.jsm");
+Cu.import("resource:///modules/loop/LoopRooms.jsm");
Cu.import("resource://gre/modules/osfile.jsm");
-const { MozLoopServiceInternal } = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
-const { LoopRoomsInternal, timerHandlers } = Cu.import("chrome://loop/content/modules/LoopRooms.jsm", {});
+const { MozLoopServiceInternal } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
+const { LoopRoomsInternal, timerHandlers } = Cu.import("resource:///modules/loop/LoopRooms.jsm", {});
XPCOMUtils.defineLazyModuleGetter(this, "MozLoopPushHandler",
- "chrome://loop/content/modules/MozLoopPushHandler.jsm");
+ "resource:///modules/loop/MozLoopPushHandler.jsm");
const kMockWebSocketChannelName = "Mock WebSocket Channel";
const kWebSocketChannelContractID = "@mozilla.org/network/protocol;1?name=wss";
diff --git a/browser/extensions/loop/test/xpcshell/test_loopapi_doNotDisturb.js b/browser/components/loop/test/xpcshell/test_loopapi_doNotDisturb.js
similarity index 89%
rename from browser/extensions/loop/test/xpcshell/test_loopapi_doNotDisturb.js
rename to browser/components/loop/test/xpcshell/test_loopapi_doNotDisturb.js
index 5a86540b1d3c..bb32bfb1034e 100644
--- a/browser/extensions/loop/test/xpcshell/test_loopapi_doNotDisturb.js
+++ b/browser/components/loop/test/xpcshell/test_loopapi_doNotDisturb.js
@@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
var [, gHandlers] = LoopAPI.inspect();
add_task(function* test_mozLoop_doNotDisturb() {
diff --git a/browser/extensions/loop/test/xpcshell/test_loopapi_internal.js b/browser/components/loop/test/xpcshell/test_loopapi_internal.js
similarity index 96%
rename from browser/extensions/loop/test/xpcshell/test_loopapi_internal.js
rename to browser/components/loop/test/xpcshell/test_loopapi_internal.js
index 17066b85c27d..313b06d82fa6 100644
--- a/browser/extensions/loop/test/xpcshell/test_loopapi_internal.js
+++ b/browser/components/loop/test/xpcshell/test_loopapi_internal.js
@@ -3,7 +3,7 @@
"use strict";
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
const [LoopAPIInternal] = LoopAPI.inspect();
add_test(function test_intialize() {
diff --git a/browser/extensions/loop/test/xpcshell/test_loopapi_prefs.js b/browser/components/loop/test/xpcshell/test_loopapi_prefs.js
similarity index 92%
rename from browser/extensions/loop/test/xpcshell/test_loopapi_prefs.js
rename to browser/components/loop/test/xpcshell/test_loopapi_prefs.js
index 1142acfbdb05..2d84a94a3df4 100644
--- a/browser/extensions/loop/test/xpcshell/test_loopapi_prefs.js
+++ b/browser/components/loop/test/xpcshell/test_loopapi_prefs.js
@@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
var [, gHandlers] = LoopAPI.inspect();
add_task(function* test_mozLoop_charPref() {
diff --git a/browser/extensions/loop/test/xpcshell/test_looppush_initialize.js b/browser/components/loop/test/xpcshell/test_looppush_initialize.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_looppush_initialize.js
rename to browser/components/loop/test/xpcshell/test_looppush_initialize.js
diff --git a/browser/extensions/loop/test/xpcshell/test_looprooms.js b/browser/components/loop/test/xpcshell/test_looprooms.js
similarity index 99%
rename from browser/extensions/loop/test/xpcshell/test_looprooms.js
rename to browser/components/loop/test/xpcshell/test_looprooms.js
index 6930b3cf07d2..2ead43579f2f 100644
--- a/browser/extensions/loop/test/xpcshell/test_looprooms.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms.js
@@ -5,7 +5,7 @@
"use strict";
Cu.import("resource://services-common/utils.js");
-Cu.import("chrome://loop/content/modules/LoopRooms.jsm");
+Cu.import("resource:///modules/loop/LoopRooms.jsm");
Cu.import("resource:///modules/Chat.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
diff --git a/browser/extensions/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js b/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
similarity index 98%
rename from browser/extensions/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
rename to browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
index 1d2eb38c0d4c..23ef34e64ee9 100644
--- a/browser/extensions/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
@@ -7,7 +7,7 @@
timerHandlers.startTimer = callback => callback();
Cu.import("resource://services-common/utils.js");
-const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("chrome://loop/content/modules/LoopRoomsCache.jsm", {});
+const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("resource:///modules/loop/LoopRoomsCache.jsm", {});
const kContextEnabledPref = "loop.contextInConverations.enabled";
diff --git a/browser/extensions/loop/test/xpcshell/test_looprooms_first_notification.js b/browser/components/loop/test/xpcshell/test_looprooms_first_notification.js
similarity index 98%
rename from browser/extensions/loop/test/xpcshell/test_looprooms_first_notification.js
rename to browser/components/loop/test/xpcshell/test_looprooms_first_notification.js
index d32321f26a1b..daaa6cd8f599 100644
--- a/browser/extensions/loop/test/xpcshell/test_looprooms_first_notification.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms_first_notification.js
@@ -4,7 +4,7 @@
"use strict";
Cu.import("resource://services-common/utils.js");
-Cu.import("chrome://loop/content/modules/LoopRooms.jsm");
+Cu.import("resource:///modules/loop/LoopRooms.jsm");
Cu.import("resource:///modules/Chat.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
diff --git a/browser/extensions/loop/test/xpcshell/test_looprooms_getall.js b/browser/components/loop/test/xpcshell/test_looprooms_getall.js
similarity index 98%
rename from browser/extensions/loop/test/xpcshell/test_looprooms_getall.js
rename to browser/components/loop/test/xpcshell/test_looprooms_getall.js
index b4351e16a7eb..534ec287f1a4 100644
--- a/browser/extensions/loop/test/xpcshell/test_looprooms_getall.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms_getall.js
@@ -4,6 +4,7 @@
"use strict";
Cu.import("resource://services-common/utils.js");
+Cu.import("resource:///modules/loop/LoopRooms.jsm");
Cu.import("resource:///modules/Chat.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
diff --git a/browser/extensions/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js b/browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
similarity index 95%
rename from browser/extensions/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
rename to browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
index acd73e23950e..36fdac465fb6 100644
--- a/browser/extensions/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
@@ -6,8 +6,8 @@
Cu.import("resource://services-common/utils.js");
-const loopCrypto = Cu.import("chrome://loop/content/shared/js/crypto.js", {}).LoopCrypto;
-const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("chrome://loop/content/modules/LoopRoomsCache.jsm", {});
+const loopCrypto = Cu.import("resource:///modules/loop/crypto.js", {}).LoopCrypto;
+const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("resource:///modules/loop/LoopRoomsCache.jsm", {});
var gTimerArgs = [];
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_dnd.js b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_dnd.js
rename to browser/components/loop/test/xpcshell/test_loopservice_dnd.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_encryptionkey.js b/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_encryptionkey.js
rename to browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_hawk_errors.js b/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js
similarity index 98%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_hawk_errors.js
rename to browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js
index 96d2f298c219..9cbe314ff0e9 100644
--- a/browser/extensions/loop/test/xpcshell/test_loopservice_hawk_errors.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js
@@ -10,7 +10,7 @@
"use strict";
-const { INVALID_AUTH_TOKEN } = Cu.import("chrome://loop/content/modules/MozLoopService.jsm");
+const { INVALID_AUTH_TOKEN } = Cu.import("resource:///modules/loop/MozLoopService.jsm");
/**
* An HTTP request for /NNN responds with a request with a status of NNN.
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_hawk_request.js b/browser/components/loop/test/xpcshell/test_loopservice_hawk_request.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_hawk_request.js
rename to browser/components/loop/test/xpcshell/test_loopservice_hawk_request.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_initialize.js b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_initialize.js
rename to browser/components/loop/test/xpcshell/test_loopservice_initialize.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_locales.js b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_locales.js
rename to browser/components/loop/test/xpcshell/test_loopservice_locales.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_loop_prefs.js b/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_loop_prefs.js
rename to browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_registration.js
rename to browser/components/loop/test/xpcshell/test_loopservice_registration.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_registration_retry.js b/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_registration_retry.js
rename to browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_restart.js b/browser/components/loop/test/xpcshell/test_loopservice_restart.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_restart.js
rename to browser/components/loop/test/xpcshell/test_loopservice_restart.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_token_invalid.js b/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_token_invalid.js
rename to browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_token_save.js b/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_token_save.js
rename to browser/components/loop/test/xpcshell/test_loopservice_token_save.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_token_send.js b/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_token_send.js
rename to browser/components/loop/test/xpcshell/test_loopservice_token_send.js
diff --git a/browser/extensions/loop/test/xpcshell/test_loopservice_token_validation.js b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/test_loopservice_token_validation.js
rename to browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
diff --git a/browser/extensions/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
similarity index 100%
rename from browser/extensions/loop/test/xpcshell/xpcshell.ini
rename to browser/components/loop/test/xpcshell/xpcshell.ini
diff --git a/browser/extensions/loop/ui/README.md b/browser/components/loop/ui/README.md
similarity index 82%
rename from browser/extensions/loop/ui/README.md
rename to browser/components/loop/ui/README.md
index f3912bc0090b..a0025bb5cff9 100644
--- a/browser/extensions/loop/ui/README.md
+++ b/browser/components/loop/ui/README.md
@@ -5,6 +5,6 @@ This app file showcases all Loop's view components.
If you want to modify the app, launch the following command:
- browser/extensions/loop/build-jsx --watch
+ browser/components/loop/build-jsx --watch
And start editing the `ui-showcase.jsx` file.
diff --git a/browser/extensions/loop/ui/fake-l10n.js b/browser/components/loop/ui/fake-l10n.js
similarity index 100%
rename from browser/extensions/loop/ui/fake-l10n.js
rename to browser/components/loop/ui/fake-l10n.js
diff --git a/browser/extensions/loop/ui/fake-mozLoop.js b/browser/components/loop/ui/fake-mozLoop.js
similarity index 100%
rename from browser/extensions/loop/ui/fake-mozLoop.js
rename to browser/components/loop/ui/fake-mozLoop.js
diff --git a/browser/extensions/loop/ui/index.html b/browser/components/loop/ui/index.html
similarity index 78%
rename from browser/extensions/loop/ui/index.html
rename to browser/components/loop/ui/index.html
index b0581de67d22..1ea6254e3277 100644
--- a/browser/extensions/loop/ui/index.html
+++ b/browser/components/loop/ui/index.html
@@ -10,7 +10,7 @@
+ href="../content/css/panel.css">
@@ -25,10 +25,10 @@
-
-
-
-
+
+
+
+
@@ -43,16 +43,16 @@
-
+
-
-
+
+
-
-
+
+
+
{mozL10n.get("invite_email_link_button")}