Bug 1339610 - Move chrome:// container icons to be resource:// paths so extension developers can use them. r=baku
authorJonathan Kingston <jkt@mozilla.com>
Fri, 25 Aug 2017 12:30:16 +0100
changeset 428511 d08ea6b954941a493134160669bbaa384e6520e2
parent 428510 f069f3c695977904c4b2dda44a5218efe17d28b5
child 428512 34d6906c255925a1b1e3a223b2b9f804f4ebf590
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1339610
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1339610 - Move chrome:// container icons to be resource:// paths so extension developers can use them. r=baku MozReview-Commit-ID: JLmKPftt2rG
browser/base/content/usercontext-briefcase.svg
browser/base/content/usercontext-cart.svg
browser/base/content/usercontext-chill.svg
browser/base/content/usercontext-circle.svg
browser/base/content/usercontext-dollar.svg
browser/base/content/usercontext-fingerprint.svg
browser/base/content/usercontext-food.svg
browser/base/content/usercontext-fruit.svg
browser/base/content/usercontext-gift.svg
browser/base/content/usercontext-pet.svg
browser/base/content/usercontext-tree.svg
browser/base/content/usercontext-vacation.svg
browser/base/jar.mn
browser/components/contextualidentity/content/briefcase.svg
browser/components/contextualidentity/content/cart.svg
browser/components/contextualidentity/content/chill.svg
browser/components/contextualidentity/content/circle.svg
browser/components/contextualidentity/content/dollar.svg
browser/components/contextualidentity/content/fingerprint.svg
browser/components/contextualidentity/content/food.svg
browser/components/contextualidentity/content/fruit.svg
browser/components/contextualidentity/content/gift.svg
browser/components/contextualidentity/content/pet.svg
browser/components/contextualidentity/content/tree.svg
browser/components/contextualidentity/content/usercontext.css
browser/components/contextualidentity/content/vacation.svg
browser/components/contextualidentity/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -132,28 +132,16 @@ browser.jar:
         content/browser/sanitizeDialog.js             (content/sanitizeDialog.js)
         content/browser/sanitizeDialog.css            (content/sanitizeDialog.css)
         content/browser/contentSearchUI.js            (content/contentSearchUI.js)
         content/browser/contentSearchUI.css           (content/contentSearchUI.css)
         content/browser/tabbrowser.css                (content/tabbrowser.css)
         content/browser/tabbrowser.xml                (content/tabbrowser.xml)
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
         content/browser/utilityOverlay.js             (content/utilityOverlay.js)
-        content/browser/usercontext-briefcase.svg     (content/usercontext-briefcase.svg)
-        content/browser/usercontext-cart.svg          (content/usercontext-cart.svg)
-        content/browser/usercontext-circle.svg        (content/usercontext-circle.svg)
-        content/browser/usercontext-dollar.svg        (content/usercontext-dollar.svg)
-        content/browser/usercontext-fingerprint.svg   (content/usercontext-fingerprint.svg)
-        content/browser/usercontext-gift.svg          (content/usercontext-gift.svg)
-        content/browser/usercontext-vacation.svg      (content/usercontext-vacation.svg)
-        content/browser/usercontext-food.svg          (content/usercontext-food.svg)
-        content/browser/usercontext-fruit.svg         (content/usercontext-fruit.svg)
-        content/browser/usercontext-pet.svg           (content/usercontext-pet.svg)
-        content/browser/usercontext-tree.svg          (content/usercontext-tree.svg)
-        content/browser/usercontext-chill.svg         (content/usercontext-chill.svg)
         content/browser/web-panels.js                 (content/web-panels.js)
 *       content/browser/web-panels.xul                (content/web-panels.xul)
         content/browser/webext-panels.js              (content/webext-panels.js)
 *       content/browser/webext-panels.xul             (content/webext-panels.xul)
 *       content/browser/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
         content/browser/nsContextMenu.js              (content/nsContextMenu.js)
 # XXX: We should exclude this one as well (bug 71895)
 *       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
rename from browser/base/content/usercontext-briefcase.svg
rename to browser/components/contextualidentity/content/briefcase.svg
rename from browser/base/content/usercontext-cart.svg
rename to browser/components/contextualidentity/content/cart.svg
rename from browser/base/content/usercontext-chill.svg
rename to browser/components/contextualidentity/content/chill.svg
rename from browser/base/content/usercontext-circle.svg
rename to browser/components/contextualidentity/content/circle.svg
rename from browser/base/content/usercontext-dollar.svg
rename to browser/components/contextualidentity/content/dollar.svg
rename from browser/base/content/usercontext-fingerprint.svg
rename to browser/components/contextualidentity/content/fingerprint.svg
rename from browser/base/content/usercontext-food.svg
rename to browser/components/contextualidentity/content/food.svg
rename from browser/base/content/usercontext-fruit.svg
rename to browser/components/contextualidentity/content/fruit.svg
rename from browser/base/content/usercontext-gift.svg
rename to browser/components/contextualidentity/content/gift.svg
rename from browser/base/content/usercontext-pet.svg
rename to browser/components/contextualidentity/content/pet.svg
rename from browser/base/content/usercontext-tree.svg
rename to browser/components/contextualidentity/content/tree.svg
--- a/browser/components/contextualidentity/content/usercontext.css
+++ b/browser/components/contextualidentity/content/usercontext.css
@@ -34,61 +34,61 @@
 }
 
 [data-identity-color="purple"] {
   --identity-tab-color: #af51f5;
   --identity-icon-color: #af51f5;
 }
 
 [data-identity-icon="fingerprint"] {
-  --identity-icon: url("chrome://browser/content/usercontext-fingerprint.svg");
+  --identity-icon: url("resource://usercontext-content/fingerprint.svg");
 }
 
 [data-identity-icon="briefcase"] {
-  --identity-icon: url("chrome://browser/content/usercontext-briefcase.svg");
+  --identity-icon: url("resource://usercontext-content/briefcase.svg");
 }
 
 [data-identity-icon="dollar"] {
-  --identity-icon: url("chrome://browser/content/usercontext-dollar.svg");
+  --identity-icon: url("resource://usercontext-content/dollar.svg");
 }
 
 [data-identity-icon="cart"] {
-  --identity-icon: url("chrome://browser/content/usercontext-cart.svg");
+  --identity-icon: url("resource://usercontext-content/cart.svg");
 }
 
 [data-identity-icon="circle"] {
-  --identity-icon: url("chrome://browser/content/usercontext-circle.svg");
+  --identity-icon: url("resource://usercontext-content/circle.svg");
 }
 
 [data-identity-icon="vacation"] {
-  --identity-icon: url("chrome://browser/content/usercontext-vacation.svg");
+  --identity-icon: url("resource://usercontext-content/vacation.svg");
 }
 
 [data-identity-icon="gift"] {
-  --identity-icon: url("chrome://browser/content/usercontext-gift.svg");
+  --identity-icon: url("resource://usercontext-content/gift.svg");
 }
 
 [data-identity-icon="food"] {
-  --identity-icon: url("chrome://browser/content/usercontext-food.svg");
+  --identity-icon: url("resource://usercontext-content/food.svg");
 }
 
 [data-identity-icon="fruit"] {
-  --identity-icon: url("chrome://browser/content/usercontext-fruit.svg");
+  --identity-icon: url("resource://usercontext-content/fruit.svg");
 }
 
 [data-identity-icon="pet"] {
-  --identity-icon: url("chrome://browser/content/usercontext-pet.svg");
+  --identity-icon: url("resource://usercontext-content/pet.svg");
 }
 
 [data-identity-icon="tree"] {
-  --identity-icon: url("chrome://browser/content/usercontext-tree.svg");
+  --identity-icon: url("resource://usercontext-content/tree.svg");
 }
 
 [data-identity-icon="chill"] {
-  --identity-icon: url("chrome://browser/content/usercontext-chill.svg");
+  --identity-icon: url("resource://usercontext-content/chill.svg");
 }
 
 #userContext-indicator {
   height: 16px;
   width: 16px;
 }
 
 #userContext-label {
rename from browser/base/content/usercontext-vacation.svg
rename to browser/components/contextualidentity/content/vacation.svg
--- a/browser/components/contextualidentity/jar.mn
+++ b/browser/components/contextualidentity/jar.mn
@@ -1,6 +1,20 @@
 # 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:
     content/browser/usercontext/usercontext.css (content/usercontext.css)
+
+% resource usercontext-content %content/ contentaccessible=yes
+    content/briefcase.svg     (content/briefcase.svg)
+    content/cart.svg          (content/cart.svg)
+    content/circle.svg        (content/circle.svg)
+    content/dollar.svg        (content/dollar.svg)
+    content/fingerprint.svg   (content/fingerprint.svg)
+    content/gift.svg          (content/gift.svg)
+    content/vacation.svg      (content/vacation.svg)
+    content/food.svg          (content/food.svg)
+    content/fruit.svg         (content/fruit.svg)
+    content/pet.svg           (content/pet.svg)
+    content/tree.svg          (content/tree.svg)
+    content/chill.svg         (content/chill.svg)