Bug 1008201: update Loop toolbar icon to a speech bubble. r=jaws

browser/themes/linux/jar.mn

@@ -81,6 +81,8 @@ browser.jar:
   skin/classic/browser/webRTC-camera-white-16.png     (../shared/webrtc/camera-white-16.png)
   skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png)
   skin/classic/browser/webRTC-screen-white-16.png     (../shared/webrtc/screen-white-16.png)
+  skin/classic/browser/loop/toolbar.png               (loop/toolbar.png)
+  skin/classic/browser/loop/toolbar-inverted.png      (loop/toolbar-inverted.png)
   skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
   skin/classic/browser/customizableui/customize-illustration.png  (../shared/customizableui/customize-illustration.png)
   skin/classic/browser/customizableui/customize-illustration-rtl.png  (../shared/customizableui/customize-illustration-rtl.png)

browser/themes/osx/browser.css

@@ -1320,6 +1320,39 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
   #PanelUI-help > .toolbarbutton-icon {
     width: 16px;
   }
+
+  #loop-call-button > .toolbarbutton-badge-container {
+    list-style-image: url("chrome://browser/skin/loop/toolbar@2x.png");
+    -moz-image-region: rect(0, 36px, 36px, 0);
+  }
+
+  toolbar[brighttext] #loop-call-button > .toolbarbutton-badge-container {
+    list-style-image: url("chrome://browser/skin/loop/toolbar-inverted@2x.png");
+  }
+
+  #loop-call-button[disabled="true"] > .toolbarbutton-badge-container {
+    -moz-image-region: rect(0, 72px, 36px, 36px);
+  }
+
+  #loop-call-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
+    -moz-image-region: rect(0, 108px, 36px, 72px);
+  }
+
+  #loop-call-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
+    -moz-image-region: rect(0, 144px, 36px, 108px);
+  }
+
+  #loop-call-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+    -moz-image-region: rect(0, 180px, 36px, 144px);
+  }
+
+  #loop-call-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
+    -moz-image-region: rect(0, 216px, 36px, 180px);
+  }
+
+  #loop-call-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+    -moz-image-region: rect(0, 252px, 36px, 216px);
+  }
 }
 
 toolbar .toolbarbutton-1:not([type="menu-button"]),
@@ -2214,12 +2247,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   }
 }
 
-/* Loop */
-/* XXX - probably need retina images here */
-#loop-call-button {
-  list-style-image: url("chrome://global/skin/loop/loop-call.png");
-}
-
 /* social share panel */
 .social-share-frame {
   background: linear-gradient(to bottom, rgba(242,242,242,.99), rgba(242,242,242,.95));

browser/themes/osx/jar.mn

@@ -134,6 +134,10 @@ browser.jar:
   skin/classic/browser/webRTC-camera-black-16.png
   skin/classic/browser/webRTC-microphone-black-16.png
   skin/classic/browser/webRTC-screen-black-16.png
+  skin/classic/browser/loop/toolbar.png               (loop/toolbar.png)
+  skin/classic/browser/loop/toolbar@2x.png            (loop/toolbar@2x.png)
+  skin/classic/browser/loop/toolbar-inverted.png      (loop/toolbar-inverted.png)
+  skin/classic/browser/loop/toolbar-inverted@2x.png   (loop/toolbar-inverted@2x.png)
   skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
   skin/classic/browser/customizableui/customize-titleBar-toggle.png  (customizableui/customize-titleBar-toggle.png)
   skin/classic/browser/customizableui/customize-titleBar-toggle@2x.png  (customizableui/customize-titleBar-toggle@2x.png)

browser/themes/shared/toolbarbuttons.inc.css

@@ -167,3 +167,36 @@ toolbar[brighttext] #sync-button[status="active"]:hover:active:not([disabled="tr
 #sidebar-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 684px, 18px, 666px);
 }
+
+#loop-call-button > .toolbarbutton-badge-container {
+  list-style-image: url(chrome://browser/skin/loop/toolbar.png);
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+toolbar[brighttext] #loop-call-button > .toolbarbutton-badge-container {
+  list-style-image: url(chrome://browser/skin/loop/toolbar-inverted.png);
+}
+
+#loop-call-button[disabled="true"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#loop-call-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#loop-call-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#loop-call-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#loop-call-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 108px, 18px, 90px);
+}
+
+#loop-call-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 126px, 18px, 108px);
+}

browser/themes/windows/browser.css

@@ -573,6 +573,10 @@ menuitem.bookmark-item {
   #bookmarks-menu-button.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png");
   }
+
+  #loop-call-button > .toolbarbutton-badge-container {
+    list-style-image: url(chrome://browser/skin/loop/toolbar-lunaSilver.png)
+  }
 }
 %endif
 
@@ -1540,11 +1544,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
-/* Loop */
-#loop-call-button {
-  list-style-image: url("chrome://global/skin/loop/loop-call.png");
-}
-
 /* social share panel */
 
 #social-share-panel > iframe {

browser/themes/windows/jar.mn

@@ -102,6 +102,9 @@ browser.jar:
         skin/classic/browser/webRTC-camera-white-16.png              (../shared/webrtc/camera-white-16.png)
         skin/classic/browser/webRTC-microphone-white-16.png          (../shared/webrtc/microphone-white-16.png)
         skin/classic/browser/webRTC-screen-white-16.png              (../shared/webrtc/screen-white-16.png)
+        skin/classic/browser/loop/toolbar.png                        (loop/toolbar-XPVista7.png)
+        skin/classic/browser/loop/toolbar-lunaSilver.png             (loop/toolbar-lunaSilver.png)
+        skin/classic/browser/loop/toolbar-inverted.png               (loop/toolbar-inverted.png)
         skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
         skin/classic/browser/customizableui/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
         skin/classic/browser/customizableui/customize-illustration.png  (../shared/customizableui/customize-illustration.png)
@@ -518,6 +521,9 @@ browser.jar:
         skin/classic/aero/browser/webRTC-camera-white-16.png              (../shared/webrtc/camera-white-16.png)
         skin/classic/aero/browser/webRTC-microphone-white-16.png          (../shared/webrtc/microphone-white-16.png)
         skin/classic/aero/browser/webRTC-screen-white-16.png              (../shared/webrtc/screen-white-16.png)
+        skin/classic/aero/browser/loop/toolbar.png                        (loop/toolbar.png)
+        skin/classic/aero/browser/loop/toolbar-XPVista7.png               (loop/toolbar-XPVista7.png)
+        skin/classic/aero/browser/loop/toolbar-inverted.png               (loop/toolbar-inverted.png)
         skin/classic/aero/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
         skin/classic/aero/browser/customizableui/customize-illustration.png  (../shared/customizableui/customize-illustration.png)
         skin/classic/aero/browser/customizableui/customize-illustration-rtl.png  (../shared/customizableui/customize-illustration-rtl.png)
@@ -844,3 +850,6 @@ browser.jar:
 
 % override chrome://browser/skin/sync-horizontalbar.png          chrome://browser/skin/sync-horizontalbar-XPVista7.png          os=WINNT osversion<6.2
 % override chrome://browser/skin/syncProgress-horizontalbar.png  chrome://browser/skin/syncProgress-horizontalbar-XPVista7.png  os=WINNT osversion<6.2
+
+% override chrome://browser/skin/loop/toolbar.png          chrome://browser/skin/loop/toolbar-XPVista7.png         os=WINNT osversion=6
+% override chrome://browser/skin/loop/toolbar.png          chrome://browser/skin/loop/toolbar-XPVista7.png         os=WINNT osversion=6.1

toolkit/themes/linux/global/jar.mn

@@ -53,6 +53,5 @@ toolkit.jar:
 +  skin/classic/global/icons/wrap.png                          (icons/wrap.png)
 +  skin/classic/global/icons/webapps-16.png                    (icons/webapps-16.png)
 +  skin/classic/global/icons/webapps-64.png                    (icons/webapps-64.png)
-   skin/classic/global/loop/loop-call.png                      (loop/loop-call.png)
    skin/classic/global/menu/shared-menu-check.png              (../../shared/menu-check.png)
 +  skin/classic/global/toolbar/spring.png                      (toolbar/spring.png)

toolkit/themes/osx/global/jar.mn

@@ -143,7 +143,6 @@ toolkit.jar:
   skin/classic/global/icons/webapps-16@2x.png                        (icons/webapps-16@2x.png)
   skin/classic/global/icons/webapps-64.png                           (icons/webapps-64.png)
   skin/classic/global/inContentUI/background-texture.png            (inContentUI/background-texture.png)
-  skin/classic/global/loop/loop-call.png                             (loop/loop-call.png)
   skin/classic/global/notification/close.png                         (notification/close.png)
   skin/classic/global/notification/critical-bar-background.png       (notification/critical-bar-background.png)
   skin/classic/global/notification/error-icon.png                    (notification/error-icon.png)

toolkit/themes/windows/global/jar.mn

@@ -148,7 +148,6 @@ toolkit.jar:
         skin/classic/global/icons/webapps-16.png                 (icons/webapps-16.png)
         skin/classic/global/icons/webapps-64.png                 (icons/webapps-64.png)
         skin/classic/global/inContentUI/background-texture.png   (inContentUI/background-texture.png)
-        skin/classic/global/loop/loop-call.png                   (loop/loop-call.png)
         skin/classic/global/media/TopLevelImageDocument.css      (media/TopLevelImageDocument.css)
         skin/classic/global/media/TopLevelVideoDocument.css      (media/TopLevelVideoDocument.css)
         skin/classic/global/media/imagedoc-lightnoise.png        (media/imagedoc-lightnoise.png)
@@ -332,7 +331,6 @@ toolkit.jar:
         skin/classic/aero/global/icons/webapps-16.png                    (icons/webapps-16.png)
         skin/classic/aero/global/icons/webapps-64.png                    (icons/webapps-64.png)
         skin/classic/aero/global/inContentUI/background-texture.png      (inContentUI/background-texture.png)
-        skin/classic/aero/global/loop/loop-call.png                      (loop/loop-call.png)
         skin/classic/aero/global/media/TopLevelImageDocument.css         (media/TopLevelImageDocument.css)
         skin/classic/aero/global/media/TopLevelVideoDocument.css         (media/TopLevelVideoDocument.css)
         skin/classic/aero/global/media/imagedoc-lightnoise.png           (media/imagedoc-lightnoise.png)