Bug 969045 - Add feedback item in Settings charm. r=mbrubeck

browser/metro/base/content/browser-ui.js

@@ -48,6 +48,7 @@ let Elements = {};
   ["contentViewport",    "content-viewport"],
   ["progress",           "progress-control"],
   ["progressContainer",  "progress-container"],
+  ["feedbackLabel",  "feedback-label"],
 ].forEach(function (aElementGlobal) {
   let [name, id] = aElementGlobal;
   XPCOMUtils.defineLazyGetter(Elements, name, function() {

browser/metro/base/content/browser.xul

@@ -30,6 +30,8 @@
 <!ENTITY % syncDTD SYSTEM "chrome://browser/locale/sync.dtd">
 %syncDTD;
 #endif
+<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://browser/locale/baseMenuOverlay.dtd">
+%baseMenuOverlayDTD;
 ]>
 
 <window id="main-window"
@@ -852,5 +854,6 @@ Desktop browser's sync prefs.
       </vbox>
     </box>
   </stack>
-
+  <!-- XXX: Expose feedback string to SettingsCharm.js -->
+  <label value="&helpFeedbackPage.label;" id="feedback-label" href="https://input.mozilla.org/feedback/metrofirefox" hidden="true"/>
 </window>

browser/metro/base/content/flyoutpanels/SettingsCharm.js

@@ -52,6 +52,17 @@ var SettingsCharm = {
         onselected: function() FlyoutPanelsUI.show('AboutFlyoutPanel')
     });
 
+    // Feedback
+    this.addEntry({
+        // feedbackLabel is a temporary measure to expose this string
+        // from the baseMenuOverlay.dtd
+        label: Elements.feedbackLabel.value,
+        onselected: function() {
+          let url = Elements.feedbackLabel.getAttribute("href");
+          BrowserUI.addAndShowTab(url, Browser.selectedTab);
+        }
+    });
+
     // Help
     this.addEntry({
         label: Strings.browser.GetStringFromName("helpOnlineCharm"),

browser/metro/locales/jar.mn

@@ -39,6 +39,8 @@
 @AB_CD@.jar:
 relativesrcdir browser/locales:
   locale/browser/syncBrand.dtd            (%chrome/browser/syncBrand.dtd)
+# Temporary hack to provide a 'feedback' string
+  locale/browser/baseMenuOverlay.dtd      (%chrome/browser/baseMenuOverlay.dtd)
   locale/browser/netError.dtd             (%chrome/overrides/netError.dtd)
 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
   locale/browser/appstrings.properties    (%chrome/overrides/appstrings.properties)