From e8639257e374906a6514468f3f471ba45381d25d Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:48 +0100
Subject: [PATCH] Bug 1008116 Show the Loop button by default and update the
 tooltip and panel text. r=mhammond

---
 browser/base/content/browser.xul                         | 9 ++++++---
 browser/components/customizableui/src/CustomizableUI.jsm | 3 +++
 browser/locales/en-US/chrome/browser/browser.dtd         | 2 ++
 .../locales/en-US/chrome/browser/loop/loop.properties    | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 4e66d06808e..8dd62fe1a46 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -643,7 +643,11 @@
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="small"
+#ifdef MOZ_LOOP
+             defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item"
+#else
              defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
+#endif
              customizationtarget="nav-bar-customization-target"
              overflowable="true"
              overflowbutton="nav-bar-overflow-button"
@@ -777,13 +781,12 @@
         </toolbarbutton>
 
 #ifdef MOZ_LOOP
-        <!-- XXX Bug 1008116 will do the initial L10n for these -->
+        <!-- XXX Bug 1013989 will provide a label for the button -->
         <toolbarbutton id="loop-call-button"
                        class="toolbarbutton-1 chromeclass-toolbar-additional"
                        persist="class"
                        removable="true"
-                       label="Loop"
-                       tooltiptext="Start a conversation"
+                       tooltiptext="&loopCallButton.tooltip;"
                        oncommand="LoopUI.openCallPanel(event);"
                        cui-areatype="toolbar"
                        overflows="false"
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index c3e712391ee..8c9c888d0bf 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -200,6 +200,9 @@ let CustomizableUIInternal = {
         "bookmarks-menu-button",
         "downloads-button",
         "home-button",
+#ifdef MOZ_LOOP
+        "loop-call-button",
+#endif
         "social-share-button",
       ],
       defaultCollapsed: false,
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 3808c29be56..92338c3053e 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -706,6 +706,8 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY webrtcIndicatorButton.label "Camera / Microphone Access">
 <!ENTITY webrtcIndicatorButton.tooltip "Display sites you are currently sharing your camera or microphone with">
 
+<!ENTITY loopCallButton.tooltip "Invite someone to talk">
+
 <!ENTITY mixedContentBlocked.moreinfo "Most websites will still work properly even when this content is blocked.">
 
 <!ENTITY pointerLock.notification.message "Press ESC at any time to show it again.">
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 947bfb1b40d..4aaf7fbe285 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -1,4 +1,4 @@
-get_link_to_share=Get a link to share with a friend to Video Chat.
+get_link_to_share=Get a link and invite someone to talk
 get_a_call_url=Get a call url
 new_url=New url
 unable_retrieve_url=Sorry, we were unable to retrieve a call url.