Bug 961223 - Character encoding in app bar: implement it or remove it from Options.r=azasypkin
authorAllison Naaktgeboren <ally@mozilla.com>
Thu, 23 Jan 2014 09:44:37 -0800
changeset 164961 a9913c62d98a74bcf097c6a6780bf75cdeb8187e
parent 164960 7cc7604607e41b9d4cdba61960db64dd20a569c6
child 164962 67d36c90a7ea74533ed7e029ebb41ce030edaed2
push id38854
push userryanvm@gmail.com
push dateThu, 23 Jan 2014 20:58:13 +0000
treeherdermozilla-inbound@624d042739e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersazasypkin
bugs961223
milestone29.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 961223 - Character encoding in app bar: implement it or remove it from Options.r=azasypkin
browser/metro/base/content/browser.xul
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -638,19 +638,16 @@ Desktop browser's sync prefs.
         <description>&sync.flyout.pairSuccess.description1;</description>
         <description>&sync.flyout.pairSuccess.description2;</description>
       </vbox>
 
     </flyoutpanel>
 #endif
 
     <flyoutpanel id="prefs-flyoutpanel" class="flyout-narrow" headertext="&optionsHeader.title;">
-      <settings id="prefs-charencoding" label="&optionsHeader.char.title;">
-        <setting pref="browser.menu.showCharacterEncoding" title="&optionsHeader.char.options.label;" type="bool"/>
-      </settings>
       <settings id="prefs-privdata" label="&clearPrivateData.title;">
         <description>&clearPrivateData.label;</description>
 
         <checkbox id="prefs-privdata-history" itemName="history" label="&clearPrivateData.history;" checked="true" />
 
         <checkbox id="prefs-privdata-other" label="&clearPrivateData.otherdata;"/>
         <hbox id="prefs-privdata-subitems" >
           <checkbox class="privdata-subitem-item" checked="true" itemName="downloads" label="&clearPrivateData.downloadHist;"/>