Bug 892725 - Clean up browser.xul. r=mbrubeck
authorAllison Naaktgeboren <ally@mozilla.com>
Fri, 07 Feb 2014 11:41:02 -0800
changeset 167574 a51b70ee105fda3b3065b18f07d938fa6ccb0f2c
parent 167573 ff355d6c62c0ba12c948510aa5af92e9a5231f7a
child 167575 a57801cec8be42836f59ac06e52d6b7401c220f6
push id26174
push userkwierso@gmail.com
push dateSat, 08 Feb 2014 00:55:48 +0000
treeherdermozilla-central@2c873eff7dc2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
bugs892725
milestone30.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 892725 - Clean up browser.xul. r=mbrubeck
browser/metro/base/content/browser.xul
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -39,483 +39,849 @@
         chromedir="&locale.dir;"
         title="&brandShortName;"
         width="1366"
         height="768"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:svg="http://www.w3.org/2000/svg"
         xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript" src="chrome://browser/content/browser.js"/>
-  <script type="application/javascript" src="chrome://browser/content/browser-scripts.js"/>
-  <script type="application/javascript" src="chrome://browser/content/browser-ui.js"/>
-  <script type="application/javascript" src="chrome://browser/content/Util.js"/>
-  <script type="application/javascript" src="chrome://browser/content/input.js"/>
-  <script type="application/javascript" src="chrome://browser/content/appbar.js"/>
+  <script type="application/javascript"
+          src="chrome://browser/content/browser.js"/>
+  <script type="application/javascript"
+          src="chrome://browser/content/browser-scripts.js"/>
+  <script type="application/javascript"
+          src="chrome://browser/content/browser-ui.js"/>
+  <script type="application/javascript"
+          src="chrome://browser/content/Util.js"/>
+  <script type="application/javascript"
+          src="chrome://browser/content/input.js"/>
+  <script type="application/javascript"
+          src="chrome://browser/content/appbar.js"/>
   <broadcasterset id="broadcasterset">
-    <broadcaster id="bcast_contentShowing" disabled="false"/>
-    <broadcaster id="bcast_urlbarState" mode="editing"/>
-    <broadcaster id="bcast_preciseInput" input="precise"/>
-    <broadcaster id="bcast_windowState" viewstate=""/>
-    <broadcaster id="bcast_loadingState" loading="false"/>
+    <broadcaster id="bcast_contentShowing"
+                 disabled="false"/>
+    <broadcaster id="bcast_urlbarState"
+                 mode="editing"/>
+    <broadcaster id="bcast_preciseInput"
+                 input="precise"/>
+    <broadcaster id="bcast_windowState"
+                 viewstate=""/>
+    <broadcaster id="bcast_loadingState"
+                 loading="false"/>
   </broadcasterset>
 
   <observerset id="observerset">
-    <observes id="observe_contentShowing" element="bcast_contentShowing" attribute="disabled" onbroadcast="BrowserUI.updateUIFocus();"/>
+    <observes id="observe_contentShowing"
+              element="bcast_contentShowing"
+              attribute="disabled"
+              onbroadcast="BrowserUI.updateUIFocus();"/>
   </observerset>
 
   <commandset id="mainCommandSet">
     <!-- basic navigation -->
-    <command id="cmd_back" disabled="true" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_forward" disabled="true" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_handleBackspace" oncommand="BrowserUI.handleBackspace();" />
-    <command id="cmd_handleShiftBackspace" oncommand="BrowserUI.handleShiftBackspace();" />
-    <command id="cmd_reload" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_forceReload" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_stop" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_go" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_openLocation" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_home" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_openFile" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_savePage" oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_back"
+             disabled="true"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_forward"
+             disabled="true"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_handleBackspace"
+             oncommand="BrowserUI.handleBackspace();" />
+    <command id="cmd_handleShiftBackspace"
+             oncommand="BrowserUI.handleShiftBackspace();" />
+    <command id="cmd_reload"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_forceReload"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_stop"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_go"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_openLocation"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_home"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_openFile"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_savePage"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
 
     <!-- tabs -->
-    <command id="cmd_newTab" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_newTabKey" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_closeTab" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_undoCloseTab" oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_newTab"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_newTabKey"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_closeTab"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_undoCloseTab"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
 #ifdef MOZ_SERVICES_SYNC
-    <command id="cmd_remoteTabs" oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_remoteTabs"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
 #endif
-    <command id="cmd_newPrivateTab" oncommand="BrowserUI.addAndShowPrivateTab();"/>
+    <command id="cmd_newPrivateTab"
+             oncommand="BrowserUI.addAndShowPrivateTab();"/>
 
     <!-- misc -->
-    <command id="cmd_close" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_quit" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_actions" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_panel" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_flyout_back" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_addBookmark" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_bookmarks" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_history" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_sanitize" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_contextUI" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_reportingCrashesSubmitURLs" oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_close"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_quit"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_actions"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_panel"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_flyout_back"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_addBookmark"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_bookmarks"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_history"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_sanitize"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_contextUI"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_reportingCrashesSubmitURLs"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
 
     <!-- scrolling -->
-    <command id="cmd_scrollPageUp" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_scrollPageDown" oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_scrollPageUp"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_scrollPageDown"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
 
     <!-- editing -->
-    <command id="cmd_cut" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_copy" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_copylink" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_paste" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_delete" oncommand="CommandUpdater.doCommand(this.id);"/>
-    <command id="cmd_selectAll" oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_cut"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_copy"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_copylink"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_paste"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_delete"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
+    <command id="cmd_selectAll"
+             oncommand="CommandUpdater.doCommand(this.id);"/>
 
     <!-- find -->
-    <command id="cmd_findPrevious" oncommand="FindHelperUI.goToPrevious();"/>
-    <command id="cmd_findNext" oncommand="FindHelperUI.goToNext();"/>
-    <command id="cmd_findClose" oncommand="FindHelperUI.hide();"/>
-    <command id="cmd_find" oncommand="FindHelperUI.show();"/>
+    <command id="cmd_findPrevious"
+             oncommand="FindHelperUI.goToPrevious();"/>
+    <command id="cmd_findNext"
+             oncommand="FindHelperUI.goToNext();"/>
+    <command id="cmd_findClose"
+             oncommand="FindHelperUI.hide();"/>
+    <command id="cmd_find"
+             oncommand="FindHelperUI.show();"/>
   </commandset>
 
   <keyset id="mainKeyset">
     <!-- basic navigation -->
-    <key id="key_back" keycode="VK_LEFT" command="cmd_back" modifiers="alt"/>
-    <key id="key_forward" keycode="VK_RIGHT" command="cmd_forward" modifiers="alt"/>
-    <key id="key_backspace" keycode="VK_BACK" command="cmd_handleBackspace"/>
-    <key id="key_shift_backspace" keycode="VK_BACK" command="cmd_handleShiftBackspace" modifiers="shift"/>
-    <key id="key_reload" keycode="VK_F5" command="cmd_reload"/>
-    <key id="key_reload2" key="&reload.key;" modifiers="accel" command="cmd_reload"/>
-    <key id="key_forceReload" keycode="VK_F5" modifiers="shift" command="cmd_forceReload"/>
-    <key id="key_forceReload2" key="&reload.key;" modifiers="accel,shift" command="cmd_forceReload"/>
-    <key id="key_focusURL" key="&focusURL.key;" modifiers="accel" command="cmd_openLocation"/>
-    <key id="key_focusURL2" key="&urlbar.accesskey;" modifiers="alt" command="cmd_openLocation"/>
-    <key id="key_home" keycode="VK_HOME" modifiers="accel" command="cmd_home"/>
-    <key id="key_open" key="&openFile.key;" modifiers="accel" command="cmd_openFile"/>
-    <key id="key_save" key="&savePage.key;" modifiers="accel" command="cmd_savePage"/>
+    <key id="key_back"
+         keycode="VK_LEFT"
+         command="cmd_back"
+         modifiers="alt"/>
+    <key id="key_forward"
+         keycode="VK_RIGHT"
+         command="cmd_forward"
+         modifiers="alt"/>
+    <key id="key_backspace"
+         keycode="VK_BACK"
+         command="cmd_handleBackspace"/>
+    <key id="key_shift_backspace"
+         keycode="VK_BACK"
+         command="cmd_handleShiftBackspace"
+         modifiers="shift"/>
+    <key id="key_reload"
+         keycode="VK_F5"
+         command="cmd_reload"/>
+    <key id="key_reload2"
+         key="&reload.key;"
+         modifiers="accel"
+         command="cmd_reload"/>
+    <key id="key_forceReload"
+         keycode="VK_F5"
+         modifiers="shift"
+         command="cmd_forceReload"/>
+    <key id="key_forceReload2"
+         key="&reload.key;"
+         modifiers="accel,shift"
+         command="cmd_forceReload"/>
+    <key id="key_focusURL"
+         key="&focusURL.key;"
+         modifiers="accel"
+         command="cmd_openLocation"/>
+    <key id="key_focusURL2"
+         key="&urlbar.accesskey;"
+         modifiers="alt"
+         command="cmd_openLocation"/>
+    <key id="key_home"
+         keycode="VK_HOME"
+         modifiers="accel"
+         command="cmd_home"/>
+    <key id="key_open"
+         key="&openFile.key;"
+         modifiers="accel"
+         command="cmd_openFile"/>
+    <key id="key_save"
+         key="&savePage.key;"
+         modifiers="accel"
+         command="cmd_savePage"/>
 
     <!-- misc -->
-    <key id="key_find" key="&find.key;" modifiers="accel" command="cmd_find"/>
-    <key id="key_find" key="/" command="cmd_find"/>
-    <key id="key_findNext" keycode="VK_F3" command="cmd_findNext"/>
-    <key id="key_findNext2" key="&findNext.key;" modifiers="accel" command="cmd_findNext"/>
-    <key id="key_findPrevious" keycode="VK_F3" modifiers="shift" command="cmd_findPrevious"/>
-    <key id="key_findPrevious2" key="&findNext.key;" modifiers="accel,shift" command="cmd_findPrevious"/>
-    <key id="key_quit" key="&quit.key;" modifiers="accel" command="cmd_quit"/>
-    <key id="key_addBoomkark" key="&addBookmark.key;" modifiers="accel" command="cmd_addBookmark"/>
+    <key id="key_find"
+         key="&find.key;"
+         modifiers="accel"
+         command="cmd_find"/>
+    <key id="key_find"
+         key="/"
+         command="cmd_find"/>
+    <key id="key_findNext"
+         keycode="VK_F3"
+         command="cmd_findNext"/>
+    <key id="key_findNext2"
+         key="&findNext.key;"
+         modifiers="accel"
+         command="cmd_findNext"/>
+    <key id="key_findPrevious"
+         keycode="VK_F3"
+         modifiers="shift"
+         command="cmd_findPrevious"/>
+    <key id="key_findPrevious2"
+         key="&findNext.key;"
+         modifiers="accel,shift"
+         command="cmd_findPrevious"/>
+    <key id="key_quit"
+         key="&quit.key;"
+         modifiers="accel"
+         command="cmd_quit"/>
+    <key id="key_addBoomkark"
+         key="&addBookmark.key;"
+         modifiers="accel"
+         command="cmd_addBookmark"/>
 
     <!-- development/testing -->
-    <key id="key_console" key="&jsConsole.key;" modifiers="accel,shift" oncommand="PanelUI.show('console-container')"/>
-    <key id="key_options" key="&optionsFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('PrefsFlyoutPanel')" />
-    <key id="key_options" key="&aboutFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" />
+    <key id="key_console"
+         key="&jsConsole.key;"
+         modifiers="accel,shift"
+         oncommand="PanelUI.show('console-container')"/>
+    <key id="key_options"
+         key="&optionsFlyout.key;"
+         modifiers="accel,shift"
+         oncommand="FlyoutPanelsUI.show('PrefsFlyoutPanel')" />
+    <key id="key_options"
+         key="&aboutFlyout.key;"
+         modifiers="accel,shift"
+         oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" />
 <!--
 Temporarily disabled until we can have sync prefs together with the
 Desktop browser's sync prefs.
 #ifdef MOZ_SERVICES_SYNC
-    <key id="key_options" key="&syncFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('SyncFlyoutPanel')" />
+    <key id="key_options"
+         key="&syncFlyout.key;"
+         modifiers="accel,shift"
+         oncommand="FlyoutPanelsUI.show('SyncFlyoutPanel')" />
 #endif
 -->
 
     <!-- manage tabs -->
-    <key id="key_newTab" key="&newTab.key;" modifiers="accel" command="cmd_newTabKey"/>
-    <key id="key_newTab2" key="&newTab2.key;" modifiers="accel" command="cmd_newTabKey"/>
-    <key id="key_closeTab" key="&closeTab.key;" modifiers="accel" command="cmd_closeTab"/>
-    <key id="key_closeTab2" keycode="VK_F4" modifiers="accel" command="cmd_closeTab"/>
-    <key id="key_undoCloseTab" key="&newTab.key;" modifiers="accel,shift" command="cmd_undoCloseTab"/>
-    <key id="key_newPrivateTab" key="&newPrivateTab.key;" modifiers="accel,shift" command="cmd_newPrivateTab"/>
+    <key id="key_newTab"
+         key="&newTab.key;"
+         modifiers="accel"
+         command="cmd_newTabKey"/>
+    <key id="key_newTab2"
+         key="&newTab2.key;"
+         modifiers="accel"
+         command="cmd_newTabKey"/>
+    <key id="key_closeTab"
+         key="&closeTab.key;"
+         modifiers="accel"
+         command="cmd_closeTab"/>
+    <key id="key_closeTab2"
+         keycode="VK_F4"
+         modifiers="accel"
+         command="cmd_closeTab"/>
+    <key id="key_undoCloseTab"
+         key="&newTab.key;"
+         modifiers="accel,shift"
+         command="cmd_undoCloseTab"/>
+    <key id="key_newPrivateTab"
+         key="&newPrivateTab.key;"
+         modifiers="accel,shift"
+         command="cmd_newPrivateTab"/>
 
     <!-- tab selection -->
-    <key id="key_nextTab" oncommand="BrowserUI.selectNextTab();" keycode="VK_TAB" modifiers="accel"/>
-    <key id="key_nextTab2" oncommand="BrowserUI.selectNextTab();" keycode="VK_PAGE_DOWN" modifiers="accel"/>
-    <key id="key_prevTab" oncommand="BrowserUI.selectPreviousTab();" keycode="VK_TAB" modifiers="accel,shift"/>
-    <key id="key_prevTab2" oncommand="BrowserUI.selectPreviousTab();" keycode="VK_PAGE_UP" modifiers="accel"/>
-    <key id="key_selectTab1" oncommand="BrowserUI.selectTabAtIndex(0);" key="1" modifiers="accel"/>
-    <key id="key_selectTab2" oncommand="BrowserUI.selectTabAtIndex(1);" key="2" modifiers="accel"/>
-    <key id="key_selectTab3" oncommand="BrowserUI.selectTabAtIndex(2);" key="3" modifiers="accel"/>
-    <key id="key_selectTab4" oncommand="BrowserUI.selectTabAtIndex(3);" key="4" modifiers="accel"/>
-    <key id="key_selectTab5" oncommand="BrowserUI.selectTabAtIndex(4);" key="5" modifiers="accel"/>
-    <key id="key_selectTab6" oncommand="BrowserUI.selectTabAtIndex(5);" key="6" modifiers="accel"/>
-    <key id="key_selectTab7" oncommand="BrowserUI.selectTabAtIndex(6);" key="7" modifiers="accel"/>
-    <key id="key_selectTab8" oncommand="BrowserUI.selectTabAtIndex(7);" key="8" modifiers="accel"/>
-    <key id="key_selectLastTab" oncommand="BrowserUI.selectTabAtIndex(-1);" key="9" modifiers="accel"/>
+    <key id="key_nextTab"
+         oncommand="BrowserUI.selectNextTab();"
+         keycode="VK_TAB"
+         modifiers="accel"/>
+    <key id="key_nextTab2"
+         oncommand="BrowserUI.selectNextTab();"
+         keycode="VK_PAGE_DOWN"
+         modifiers="accel"/>
+    <key id="key_prevTab"
+         oncommand="BrowserUI.selectPreviousTab();"
+         keycode="VK_TAB"
+         modifiers="accel,shift"/>
+    <key id="key_prevTab2"
+         oncommand="BrowserUI.selectPreviousTab();"
+         keycode="VK_PAGE_UP"
+         modifiers="accel"/>
+    <key id="key_selectTab1"
+         oncommand="BrowserUI.selectTabAtIndex(0);"
+         key="1"
+         modifiers="accel"/>
+    <key id="key_selectTab2"
+         oncommand="BrowserUI.selectTabAtIndex(1);"
+         key="2"
+         modifiers="accel"/>
+    <key id="key_selectTab3"
+         oncommand="BrowserUI.selectTabAtIndex(2);"
+         key="3"
+         modifiers="accel"/>
+    <key id="key_selectTab4"
+         oncommand="BrowserUI.selectTabAtIndex(3);"
+         key="4"
+         modifiers="accel"/>
+    <key id="key_selectTab5"
+         oncommand="BrowserUI.selectTabAtIndex(4);"
+         key="5"
+         modifiers="accel"/>
+    <key id="key_selectTab6"
+         oncommand="BrowserUI.selectTabAtIndex(5);"
+         key="6"
+         modifiers="accel"/>
+    <key id="key_selectTab7"
+         oncommand="BrowserUI.selectTabAtIndex(6);"
+         key="7"
+         modifiers="accel"/>
+    <key id="key_selectTab8"
+         oncommand="BrowserUI.selectTabAtIndex(7);"
+         key="8"
+         modifiers="accel"/>
+    <key id="key_selectLastTab"
+         oncommand="BrowserUI.selectTabAtIndex(-1);"
+         key="9"
+         modifiers="accel"/>
   </keyset>
 
-  <stack id="stack" flex="1">
-    <observes element="bcast_urlbarState" attribute="*"/>
-    <observes element="bcast_windowState" attribute="*"/>
+  <stack id="stack"
+         flex="1">
+    <observes element="bcast_urlbarState"
+              attribute="*"/>
+    <observes element="bcast_windowState"
+              attribute="*"/>
     <!-- Page Area -->
     <vbox id="page">
-      <vbox id="tray" class="tray-toolbar" observes="bcast_windowState" >
+      <vbox id="tray"
+            class="tray-toolbar"
+            observes="bcast_windowState" >
         <!-- Tabs -->
-        <hbox id="tabs-container" observes="bcast_windowState">
-          <box id="tabs" flex="1"
-                observes="bcast_preciseInput"
-                onselect="BrowserUI.selectTabAndDismiss(this);"
-                onclosetab="BrowserUI.closeTab(this);"/>
+        <hbox id="tabs-container"
+              observes="bcast_windowState">
+          <box id="tabs"
+               flex="1"
+               observes="bcast_preciseInput"
+               onselect="BrowserUI.selectTabAndDismiss(this);"
+               onclosetab="BrowserUI.closeTab(this);"/>
           <vbox id="tabs-controls">
-            <toolbarbutton id="newtab-button" command="cmd_newTab" label="&newtab.label;"/>
+            <toolbarbutton id="newtab-button"
+                           command="cmd_newTab"
+                           label="&newtab.label;"/>
           </vbox>
         </hbox>
       </vbox> <!-- end tray -->
 
       <!-- Content viewport -->
       <stack id="content-viewport">
-        <observes element="bcast_windowState" attribute="startpage"/>
-        <deck id="browsers" flex="1" observes="bcast_preciseInput"/>
-        <box id="vertical-scroller" class="scroller" orient="vertical" end="0" top="0"/>
-        <box id="horizontal-scroller" class="scroller" orient="horizontal" left="0" bottom="0"/>
+        <observes element="bcast_windowState"
+                  attribute="startpage"/>
+        <deck id="browsers"
+              flex="1"
+              observes="bcast_preciseInput"/>
+        <box id="vertical-scroller"
+             class="scroller"
+             orient="vertical"
+             end="0"
+             top="0"/>
+        <box id="horizontal-scroller"
+             class="scroller"
+             orient="horizontal"
+             left="0"
+             bottom="0"/>
 
         <!-- Content touch selection overlay -->
-        <box class="selection-overlay-hidden" id="content-selection-overlay"/>
+        <box class="selection-overlay-hidden"
+             id="content-selection-overlay"/>
 
         <!-- Overlay to dim screen when autocomplete shows up -->
-        <hbox id="autocomplete-overlay" onclick="ContextUI.dismiss()"/>
+        <hbox id="autocomplete-overlay"
+              onclick="ContextUI.dismiss()"/>
       </stack>
     </vbox>
 
-    <html:div id="overlay-back" class="overlay-button"
-              observes="cmd_back"></html:div>
-    <html:div id="overlay-plus" class="overlay-button"
-              observes="cmd_back"></html:div>
+    <html:div id="overlay-back"
+              class="overlay-button"
+              observes="cmd_back">
+    </html:div>
+    <html:div id="overlay-plus"
+              class="overlay-button"
+              observes="cmd_back">
+    </html:div>
 
     <!-- Navigation bar -->
-    <appbar id="navbar" mousethrough="never" visible="true">
-      <hbox id="progress-container" layer="true" observes="bcast_windowState">
+    <appbar id="navbar"
+            mousethrough="never"
+            visible="true">
+      <hbox id="progress-container"
+            layer="true"
+            observes="bcast_windowState">
         <hbox id="progress-control" />
       </hbox>
 
-      <vbox id="toolbar-overlay" flex="1">
+      <vbox id="toolbar-overlay"
+            flex="1">
         <!-- Autocomplete -->
-        <scrollbox flex="1" id="urlbar-autocomplete-scroll" observes="bcast_urlbarState">
-          <hbox id="urlbar-autocomplete" observes="bcast_windowState"/>
+        <scrollbox id="urlbar-autocomplete-scroll"
+                   flex="1"
+                   observes="bcast_urlbarState">
+          <hbox id="urlbar-autocomplete"
+                observes="bcast_windowState"/>
         </scrollbox>
 
         <!-- Main toolbar -->
-        <toolbar id="toolbar" flex="1" observes="bcast_windowState">
-          <toolbarbutton id="back-button" class="appbar-primary"
+        <toolbar id="toolbar"
+                 flex="1"
+                 observes="bcast_windowState">
+          <toolbarbutton id="back-button"
+                         class="appbar-primary"
                          command="cmd_back"/>
-          <toolbarbutton id="forward-button" class="appbar-primary"
+          <toolbarbutton id="forward-button"
+                         class="appbar-primary"
                          command="cmd_forward"/>
 
-          <hbox id="urlbar" flex="1">
-            <observes element="bcast_urlbarState" attribute="*"/>
-            <observes element="bcast_loadingState" attribute="*"/>
-            <box id="identity-box" align="center" role="button">
+            <hbox id="urlbar"
+                  flex="1">
+            <observes element="bcast_urlbarState"
+                      attribute="*"/>
+            <observes element="bcast_loadingState"
+                      attribute="*"/>
+            <box id="identity-box"
+                 align="center"
+                 role="button">
               <image id="identity-icon"/>
             </box>
 
-            <textbox id="urlbar-edit" type="url" flex="1"
+            <textbox id="urlbar-edit"
+                     type="url"
+                     flex="1"
                      autocompletesearch="history"
                      autocompletepopup="urlbar-autocomplete"
                      completeselectedindex="true"
                      placeholder="&urlbar.emptytext;"
                      tabscrolling="true"
                      onclick="SelectionHelperUI.urlbarTextboxClick(this);"/>
 
-            <toolbarbutton id="go-button" class="urlbar-button"
+            <toolbarbutton id="go-button"
+                           class="urlbar-button"
                            command="cmd_go"/>
-            <toolbarbutton id="reload-button" class="urlbar-button"
+            <toolbarbutton id="reload-button"
+                           class="urlbar-button"
                            oncommand="CommandUpdater.doCommand(
                                         event.shiftKey ? 'cmd_forceReload'
                                                        : 'cmd_reload');"/>
-            <toolbarbutton id="stop-button" class="urlbar-button"
+            <toolbarbutton id="stop-button"
+                           class="urlbar-button"
                            command="cmd_stop"/>
           </hbox>
 
           <stack id="toolbar-contextual">
-            <observes element="bcast_windowState" attribute="*"/>
-            <observes element="bcast_urlbarState" attribute="*"/>
+            <observes element="bcast_windowState"
+                      attribute="*"/>
+            <observes element="bcast_urlbarState"
+                      attribute="*"/>
             <hbox id="toolbar-context-page" pack="end">
-              <circularprogressindicator id="download-progress" class="appbar-primary"
-                                     oncommand="MetroDownloadsView.onDownloadButton()"/>
-              <toolbarbutton id="star-button" class="appbar-primary hide-on-start"
+              <circularprogressindicator id="download-progress"
+                                         class="appbar-primary"
+                                         oncommand="MetroDownloadsView.onDownloadButton()"/>
+              <toolbarbutton id="star-button"
+                             class="appbar-primary hide-on-start"
                              type="checkbox"
                              oncommand="Appbar.onStarButton()"/>
-              <toolbarbutton id="pin-button" class="appbar-primary hide-on-start"
+              <toolbarbutton id="pin-button"
+                             class="appbar-primary hide-on-start"
                              type="checkbox"
                              oncommand="Appbar.onPinButton()"/>
-              <toolbarbutton id="menu-button" class="appbar-primary"
+              <toolbarbutton id="menu-button"
+                             class="appbar-primary"
                              oncommand="Appbar.onMenuButton(event)"/>
             </hbox>
 
-            <hbox id="toolbar-context-autocomplete" pack="end">
-              <toolbarbutton id="close-button" class="appbar-primary"
+            <hbox id="toolbar-context-autocomplete"
+                  pack="end">
+              <toolbarbutton id="close-button"
+                             class="appbar-primary"
                              oncommand="Appbar.onAutocompleteCloseButton()"/>
             </hbox>
           </stack>
         </toolbar>
       </vbox>
     </appbar>
 
-    <vbox id="panel-container" class="window-width window-height meta"
-          hidden="true" observes="bcast_windowState">
+    <vbox id="panel-container"
+          class="window-width window-height meta"
+          hidden="true"
+          observes="bcast_windowState">
       <hbox id="panel-header">
-        <toolbarbutton id="panel-close-button" class="appbar-primary"
+        <toolbarbutton id="panel-close-button"
+                       class="appbar-primary"
                        command="cmd_panel"/>
       </hbox>
 
-      <deck id="panel-items" selectedIndex="0" flex="1" >
-        <scrollbox id="bookmarks-container" flex="1">
-          <richgrid id="bookmarks-list" class="canSnapTiles"
-                    set-name="bookmarks" seltype="multiple" flex="1"/>
+      <deck id="panel-items"
+            selectedIndex="0"
+            flex="1" >
+        <scrollbox id="bookmarks-container"
+                   flex="1">
+          <richgrid id="bookmarks-list"
+                    class="canSnapTiles"
+                    set-name="bookmarks"
+                    seltype="multiple"
+                    flex="1"/>
         </scrollbox>
-        <scrollbox id="history-container" flex="1">
-          <richgrid id="history-list" class="canSnapTiles"
-                    set-name="recentHistory" seltype="multiple" flex="1"/>
+        <scrollbox id="history-container"
+                   flex="1">
+          <richgrid id="history-list"
+                    class="canSnapTiles"
+                    set-name="recentHistory"
+                    seltype="multiple"
+                    flex="1"/>
         </scrollbox>
-        <scrollbox id="remotetabs-container" flex="1">
-          <richgrid id="remotetabs-list" class="canSnapTiles"
-                    set-name="remoteTabs" seltype="single" flex="1"/>
+        <scrollbox id="remotetabs-container"
+                   flex="1">
+          <richgrid id="remotetabs-list"
+                    class="canSnapTiles"
+                    set-name="remoteTabs"
+                    seltype="single"
+                    flex="1"/>
         </scrollbox>
-        <vbox id="console-container" flex="1">
-          <vbox id="console-header" class="panel-list">
-            <label class="panel-header" value="&consoleHeader.label;"/>
+        <vbox id="console-container"
+              flex="1">
+          <vbox id="console-header"
+                class="panel-list">
+            <label class="panel-header"
+                   value="&consoleHeader.label;"/>
             <hbox align="center">
               <label value="&consoleCodeEval.label;"
                      control="console-eval-textbox"/>
-              <textbox id="console-eval-textbox" class="toolbar search-bar"
-                       value="" flex="1"
+              <textbox id="console-eval-textbox"
+                       class="toolbar search-bar"
+                       value=""
+                       flex="1"
                        onkeypress="ConsolePanelView.onEvalKeyPress(event)"/>
-              <button id="console-button-eval" class="show-text"
+              <button id="console-button-eval"
+                      class="show-text"
                       label="&consoleEvaluate.label;"
                       oncommand="ConsolePanelView.evaluateTypein()"/>
             </hbox>
-            <hbox align="center" pack="end">
+            <hbox align="center"
+                  pack="end">
               <radiogroup id="console-filter"
                           oncommand="ConsolePanelView.changeMode();">
-                <radio id="console-filter-all" value="all" selected="true"
+                <radio id="console-filter-all"
+                       value="all"
+                       selected="true"
                        label="&consoleAll.label;"/>
-                <radio id="console-filter-messages" value="message"
+                <radio id="console-filter-messages"
+                       value="message"
                        label="&consoleMessages.label;" />
-                <radio id="console-filter-warnings" value="warning"
+                <radio id="console-filter-warnings"
+                       value="warning"
                        label="&consoleWarnings.label;"/>
-                <radio id="console-filter-errors" value="error"
+                <radio id="console-filter-errors"
+                       value="error"
                        label="&consoleErrors.label;"/>
               </radiogroup>
-              <button id="console-clear" class="show-text"
+              <button id="console-clear"
+                      class="show-text"
                       label="&consoleClear.label;"
                       oncommand="ConsolePanelView.clearConsole();"/>
             </hbox>
           </vbox>
 
-          <richlistbox id="console-box" class="panel-list console-box" flex="1"
+          <richlistbox id="console-box"
+                       class="panel-list console-box"
+                       flex="1"
                        onkeypress="ConsolePanelView.onConsoleBoxKeyPress(event)"
                        oncontextmenu="ConsolePanelView.onContextMenu(event);"/>
         </vbox>
       </deck>
     </vbox>
 
     <!-- Find bar -->
-    <appbar id="findbar" class="window-width" pack="start">
-      <textbox id="findbar-textbox" type="search"
+    <appbar id="findbar"
+            class="window-width"
+            pack="start">
+      <textbox id="findbar-textbox"
+               type="search"
                oncommand="FindHelperUI.search(this.value)"
                oninput="FindHelperUI.updateCommands(this.value); "/>
 
-      <toolbarbutton id="findbar-previous-button" class="appbar-secondary"
+      <toolbarbutton id="findbar-previous-button"
+                     class="appbar-secondary"
                      command="cmd_findPrevious"/>
-      <toolbarbutton id="findbar-next-button" class="appbar-secondary"
+      <toolbarbutton id="findbar-next-button"
+                     class="appbar-secondary"
                      command="cmd_findNext"/>
 
       <spacer flex="1"/>
 
-      <toolbarbutton id="findbar-close-button" class="appbar-secondary"
+      <toolbarbutton id="findbar-close-button"
+                     class="appbar-secondary"
                      command="cmd_findClose"/>
     </appbar>
 
     <!-- Context button bar -->
     <appbar id="contextappbar">
-      <toolbar id="contextualactions-tray" labelled="true" flex="1">
-        <toolbarbutton id="pin-selected-button" class="appbar-primary"
-                       label-uses-set-name="true" hidden="true" fade="true"
+      <toolbar id="contextualactions-tray"
+               labelled="true"
+               flex="1">
+        <toolbarbutton id="pin-selected-button"
+                       class="appbar-primary"
+                       label-uses-set-name="true"
+                       hidden="true"
+                       fade="true"
                        oncommand="Appbar.dispatchContextualAction('pin')"/>
-        <toolbarbutton id="unpin-selected-button" class="appbar-primary"
-                       label-uses-set-name="true" hidden="true" fade="true"
+        <toolbarbutton id="unpin-selected-button"
+                       class="appbar-primary"
+                       label-uses-set-name="true"
+                       hidden="true"
+                       fade="true"
                        oncommand="Appbar.dispatchContextualAction('unpin')"/>
-        <toolbarbutton id="hide-selected-button" class="appbar-primary"
-                       label-uses-set-name="true" hidden="true" fade="true"
+        <toolbarbutton id="hide-selected-button"
+                       class="appbar-primary"
+                       label-uses-set-name="true"
+                       hidden="true"
+                       fade="true"
                        oncommand="Appbar.dispatchContextualAction('unpin')"/>
-        <toolbarbutton id="delete-selected-button" class="appbar-primary"
-                       hidden="true" fade="true"
+        <toolbarbutton id="delete-selected-button"
+                       class="appbar-primary"
+                       hidden="true"
+                       fade="true"
                        oncommand="Appbar.dispatchContextualAction('delete')"/>
-        <toolbarbutton id="restore-selected-button" class="appbar-primary"
-                       hidden="true" fade="true"
+        <toolbarbutton id="restore-selected-button"
+                       class="appbar-primary"
+                       hidden="true"
+                       fade="true"
                        oncommand="Appbar.dispatchContextualAction('restore')"/>
-        <toolbarbutton id="clear-selected-button" class="appbar-primary"
-                       hidden="true" fade="true"
+        <toolbarbutton id="clear-selected-button"
+                       class="appbar-primary"
+                       hidden="true"
+                       fade="true"
                        oncommand="Appbar.dispatchContextualAction('clear')"/>
       </toolbar>
     </appbar>
-    <autoscroller class="autoscroller" id="autoscrollerid"/>
-    <flyoutpanel id="about-flyoutpanel" class="flyout-narrow" headertext="&aboutHeader.title;">
+    <autoscroller class="autoscroller"
+                  id="autoscrollerid"/>
+    <flyoutpanel id="about-flyoutpanel"
+                 class="flyout-narrow"
+                 headertext="&aboutHeader.title;">
       <label align="start">
-        <html:img src="chrome://branding/content/metro-about-wordmark.png" alt="&aboutHeader.product.label;"/>
+        <html:img src="chrome://branding/content/metro-about-wordmark.png"
+                  alt="&aboutHeader.product.label;"/>
       </label>
-      <label value="&aboutHeader.company.label;" linewrap="true"/>
+      <label value="&aboutHeader.company.label;"
+             linewrap="true"/>
 #expand <label id="about-version-label">__MOZ_APP_VERSION__</label>
       <vbox id="updateBox">
 #ifdef MOZ_UPDATER
-        <deck id="updateDeck" orient="vertical">
-          <hbox id="updateButtonBox" align="center">
-            <button id="updateButton" align="start"
+      <deck id="updateDeck"
+            orient="vertical">
+          <hbox id="updateButtonBox"
+                align="center">
+            <button id="updateButton"
+                    align="start"
                     oncommand="FlyoutPanelsUI.AboutFlyoutPanel.appUpdater.buttonOnCommand();"/>
             <spacer flex="1"/>
           </hbox>
-          <hbox id="checkingForUpdates" align="center">
+          <hbox id="checkingForUpdates"
+                align="center">
             <image class="update-throbber"/>
-            <description flex="1">&update.checkingForUpdates;</description>
+            <description flex="1">
+              &update.checkingForUpdates;
+            </description>
           </hbox>
-          <hbox id="checkingAddonCompat" align="center">
-            <image class="update-throbber"/>
-            <description flex="1">&update.checkingAddonCompat;</description>
-          </hbox>
-          <hbox id="downloading" align="center">
+          <hbox id="checkingAddonCompat"
+                align="center">
             <image class="update-throbber"/>
             <description flex="1">
-              &update.downloading.start;<html:span id="downloadStatus"></html:span>&update.downloading.end;
+              &update.checkingAddonCompat;
+            </description>
+          </hbox>
+          <hbox id="downloading"
+                align="center">
+            <image class="update-throbber"/>
+            <description flex="1">
+              &update.downloading.start;
+              <html:span id="downloadStatus">
+              </html:span>
+              &update.downloading.end;
+            </description>
+          </hbox>
+          <hbox id="applying"
+                align="center">
+            <image class="update-throbber"/>
+            <description flex="1">
+              &update.applying;
             </description>
           </hbox>
-          <hbox id="applying" align="center">
-            <image class="update-throbber"/>
-            <description flex="1">&update.applying;</description>
+          <hbox id="downloadFailed"
+                align="center">
+            <label>
+              &update.failed.start;
+            </label>
+            <label id="failedLink"
+                   class="text-link">
+              &update.failed.linkText;
+            </label>
+            <label>
+              &update.failed.end;
+            </label>
           </hbox>
-          <hbox id="downloadFailed" align="center">
-            <label>&update.failed.start;</label><label id="failedLink" class="text-link">&update.failed.linkText;</label><label>&update.failed.end;</label>
+          <hbox id="adminDisabled"
+                align="center">
+            <label linewrap="true">
+              &update.adminDisabled;
+            </label>
           </hbox>
-          <hbox id="adminDisabled" align="center">
-            <label linewrap="true">&update.adminDisabled;</label>
+          <hbox id="noUpdatesFound"
+                align="center">
+            <label linewrap="true">
+              &update.noUpdatesFound;
+            </label>
           </hbox>
-          <hbox id="noUpdatesFound" align="center">
-            <label linewrap="true">&update.noUpdatesFound;</label>
+          <hbox id="otherInstanceHandlingUpdates"
+                align="center">
+            <label linewrap="true">
+              &update.otherInstanceHandlingUpdates;
+            </label>
           </hbox>
-          <hbox id="otherInstanceHandlingUpdates" align="center">
-            <label linewrap="true">&update.otherInstanceHandlingUpdates;</label>
-          </hbox>
-          <hbox id="manualUpdate" align="center">
-            <label>&update.manual.start;</label><label id="manualLink" linewrap="true" class="text-link"/><label>&update.manual.end;</label>
+          <hbox id="manualUpdate"
+                align="center">
+            <label>
+              &update.manual.start;
+            </label>
+            <label id="manualLink"
+                   linewrap="true"
+                   class="text-link"/>
+            <label>
+              &update.manual.end;
+            </label>
           </hbox>
         </deck>
 #endif
       </vbox>
 #if MOZ_UPDATE_CHANNEL != release
 #ifdef MOZ_UPDATER
-      <description class="text-blurb" id="currentChannelText">&channel.description.start;<label id="currentChannel" linewrap="true"/>&channel.description.end;</description>
+      <description id="currentChannelText"
+                   class="text-blurb">
+        &channel.description.start;
+        <label id="currentChannel" linewrap="true"/>
+        &channel.description.end;
+      </description>
 #endif
 #endif
       <label id="about-policy-label"
-            linewrap="true"
-            onclick="FlyoutPanelsUI.AboutFlyoutPanel.onPolicyClick(event);"
-            class="text-link" value="&aboutHeader.policy.label;"/>
+             linewrap="true"
+             onclick="FlyoutPanelsUI.AboutFlyoutPanel.onPolicyClick(event);"
+             class="text-link"
+             value="&aboutHeader.policy.label;"/>
       <spacer class="flyoutpanel-hack"/>
     </flyoutpanel>
 #ifdef MOZ_SERVICES_SYNC
-    <flyoutpanel id="sync-flyoutpanel" class="flyout-narrow" headertext="&sync.flyout.title;">
-      <vbox id="sync-presetup-container" collapsed="true">
+<flyoutpanel id="sync-flyoutpanel"
+             class="flyout-narrow"
+             headertext="&sync.flyout.title;">
+      <vbox id="sync-presetup-container"
+               collapsed="true">
         <description>&sync.flyout.presetup.description1;</description>
         <separator />
         <hbox onclick="FlyoutPanelsUI.SyncFlyoutPanel.startEasySetup();"
               align="center"
               class="text-link">
           <image src="chrome://browser/skin/images/plus-34.png" />
           <separator />
           <label value="&sync.flyout.presetup.setup.label;"
                  linewrap="true"
                  class="text-link" />
           <spacer flex="1" />
         </hbox>
       </vbox>
-      <vbox id="sync-setup-container" collapsed="true">
+      <vbox id="sync-setup-container"
+            collapsed="true">
         <description>&sync.flyout.setup.description1;</description>
         <description>&sync.flyout.setup.description2;</description>
         <separator />
-        <vbox flex="1" pack="center" align="start">
+        <vbox flex="1"
+              pack="center"
+              align="start">
           <textbox id="sync-setup-code1"
                    class="syncJPAKECode"
                    placeholder="...."
                    disabled="true" />
           <textbox id="sync-setup-code2"
                    class="syncJPAKECode"
                    placeholder="...."
                    disabled="true" />
           <hbox>
             <textbox id="sync-setup-code3"
-                         class="syncJPAKECode"
-                         placeholder="...."
-                         disabled="true" />
-            <vbox flex="1" pack="center" align="center">
+                     class="syncJPAKECode"
+                     placeholder="...."
+                     disabled="true" />
+            <vbox flex="1"
+                  pack="center"
+                  align="center">
               <cssthrobber id='sync-setup-throbber'
                            flex='1'
                            class='syncThrobber'
                            collapsed='true'
                            disabled='true' />
             </vbox>
           </hbox>
         </vbox>
         <separator />
         <description class="text-link"
                      flex="1"
                      onclick="FlyoutPanelsUI.SyncFlyoutPanel.abortEasySetup();
                               FlyoutPanelsUI.SyncFlyoutPanel.showManualSetup()">
           &sync.flyout.setup.manual.label_2;
         </description>
         <separator />
-        <description>&sync.flyout.setup.description3;</description>
-        <description>&sync.flyout.setup.description4_2;</description>
+        <description>
+          &sync.flyout.setup.description3;
+        </description>
+        <description>
+          &sync.flyout.setup.description4_2;
+        </description>
         <description class="syncInstructionText">
           &sync.flyout.setup.description5_2;
         </description>
         <description class="syncInstructionText">
           &sync.flyout.setup.description6_2;
         </description>
       </vbox>
 
-      <vbox id="sync-manualsetup-container" collapsed="true">
-        <description>&sync.flyout.manualsetup.description1_2;</description>
+      <vbox id="sync-manualsetup-container"
+            collapsed="true">
+        <description>
+          &sync.flyout.manualsetup.description1_2;
+        </description>
         <separator/>
         <textbox id="sync-manualsetup-account"
                  placeholder="&sync.flyout.manualsetup.account.placeholder;"
                  oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
         <textbox id="sync-manualsetup-password"
                  placeholder="&sync.flyout.manualsetup.password.placeholder;"
                  type="password"
                  oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
@@ -531,34 +897,43 @@ Desktop browser's sync prefs.
                   class="syncButton"
                   oncommand="FlyoutPanelsUI.SyncFlyoutPanel.manualSetupConnect();"
                   label="&sync.flyout.manualsetup.connect.label;"
                   disabled="true" />
           <spacer flex="1" />
         </hbox>
       </vbox>
 
-      <vbox id="sync-setupsuccess-container" collapsed="true">
-        <description>&sync.flyout.setupsuccess.description1;</description>
-        <description>&sync.flyout.setupsuccess.description2;</description>
+      <vbox id="sync-setupsuccess-container"
+            collapsed="true">
+        <description>
+          &sync.flyout.setupsuccess.description1;
+        </description>
+        <description>
+          &sync.flyout.setupsuccess.description2;
+        </description>
       </vbox>
 
-      <vbox id="sync-setupfailure-container" collapsed="true">
-        <description>&sync.flyout.setupfailure.description;</description>
+      <vbox id="sync-setupfailure-container"
+            collapsed="true">
+        <description>
+          &sync.flyout.setupfailure.description;
+        </description>
         <hbox>
           <button class="syncButton"
                   oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onCancelButton();"
                   label="&sync.flyout.setupfailure.cancelButton;" />
           <button class="syncButton"
                   oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onTryAgainButton();"
                   label="&sync.flyout.setupfailure.tryAgainButton;" />
         </hbox>
       </vbox>
 
-      <vbox id="sync-connected-container" collapsed="true">
+      <vbox id="sync-connected-container"
+            collapsed="true">
         <description id="sync-connected-account"
                      class="syncHeader" />
         <separator />
         <hbox>
           <vbox>
             <description id="sync-connected-device"
                          class="syncHeader" />
             <description id="sync-connected-lastSynced"
@@ -591,22 +966,27 @@ Desktop browser's sync prefs.
 
           </hbox>
           <separator />
         </vbox>
         <hbox onclick="FlyoutPanelsUI.SyncFlyoutPanel.onPairDeviceLink();"
               class="text-link">
           <image src="chrome://browser/skin/images/plus-24.png" />
           <separator />
-          <label>&sync.flyout.connected.pair;</label>
+          <label>
+            &sync.flyout.connected.pair;
+          </label>
         </hbox>
       </vbox>
 
-      <vbox id="sync-pair-container" collapsed="true">
-        <description>&sync.flyout.pairNewDevice.description;</description>
+      <vbox id="sync-pair-container"
+            collapsed="true">
+        <description>
+          &sync.flyout.pairNewDevice.description;
+        </description>
         <separator />
         <hbox>
           <vbox>
             <textbox id="sync-pair-entry1"
                      class="syncJPAKECode"
                      maxlength="4"
                      oninput="FlyoutPanelsUI.SyncFlyoutPanel.updatePairButtonState();" />
             <textbox id="sync-pair-entry2"
@@ -627,230 +1007,377 @@ Desktop browser's sync prefs.
         </description>
         <hbox>
           <button id="sync-pair-button"
                   label="&sync.flyout.pairNewDevice.pair;"
                   oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onPairButton();"
                   disabled="true" />
           <spacer flex="1" />
         </hbox>
-        <description>&sync.flyout.pairNewDevice.note1;</description>
-        <description>&sync.flyout.pairNewDevice.note2_2;</description>
+        <description>
+          &sync.flyout.pairNewDevice.note1;
+        </description>
+        <description>
+          &sync.flyout.pairNewDevice.note2_2;
+        </description>
         <description class="syncInstructionText">
           &sync.flyout.pairNewDevice.note3_2;
         </description>
         <description class="syncInstructionText">
           &sync.flyout.pairNewDevice.note4;
         </description>
       </vbox>
 
-      <vbox id="sync-pair-success-container" collapsed="true">
-        <description>&sync.flyout.pairSuccess.description1;</description>
-        <description>&sync.flyout.pairSuccess.description2;</description>
+      <vbox id="sync-pair-success-container"
+            collapsed="true">
+        <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-privdata" label="&clearPrivateData.title;">
-        <description>&clearPrivateData.label;</description>
+    <flyoutpanel id="prefs-flyoutpanel"
+                 class="flyout-narrow"
+                 headertext="&optionsHeader.title;">
+      <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-history"
+                  itemName="history"
+                  label="&clearPrivateData.history;"
+                  checked="true" />
 
-        <checkbox id="prefs-privdata-other" label="&clearPrivateData.otherdata;"/>
+        <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;"/>
-          <checkbox class="privdata-subitem-item" checked="true" itemName="formdata" label="&clearPrivateData.formSearchHist;"/>
-          <checkbox class="privdata-subitem-item" checked="true" itemName="cookies" label="&clearPrivateData.cookies;"/>
-          <checkbox class="privdata-subitem-item" checked="true" itemName="passwords" label="&clearPrivateData.passwords;"/>
-          <checkbox class="privdata-subitem-item" checked="true" itemName="cache" label="&clearPrivateData.cache;"/>
-          <checkbox class="privdata-subitem-item" checked="true" itemName="offlineApps" label="&clearPrivateData.offline;"/>
-          <checkbox class="privdata-subitem-item" checked="true" itemName="siteSettings" label="&clearPrivateData.sitePref;"/>
-          <checkbox class="privdata-subitem-item" checked="true" itemName="sessions" label="&clearPrivateData.logins;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="downloads"
+                    label="&clearPrivateData.downloadHist;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="formdata"
+                    label="&clearPrivateData.formSearchHist;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="cookies"
+                    label="&clearPrivateData.cookies;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="passwords"
+                    label="&clearPrivateData.passwords;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="cache"
+                    label="&clearPrivateData.cache;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="offlineApps"
+                    label="&clearPrivateData.offline;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="siteSettings"
+                    label="&clearPrivateData.sitePref;"/>
+          <checkbox class="privdata-subitem-item"
+                    checked="true"
+                    itemName="sessions"
+                    label="&clearPrivateData.logins;"/>
         </hbox>
 
         <hbox align="center">
-          <button id="prefs-clear-data" label="&clearPrivateData.button;" command="cmd_sanitize" flex="1" />
-          <deck id="clear-notification" flex="2" selectedIndex="0" align="center">
+          <button id="prefs-clear-data"
+                  label="&clearPrivateData.button;"
+                  command="cmd_sanitize"
+                  flex="1" />
+          <deck id="clear-notification"
+                flex="2"
+                selectedIndex="0"
+                align="center">
             <spacer id="clear-notification-empty"/>
-            <hbox id="clear-notification-clearing" align="center">
+            <hbox id="clear-notification-clearing"
+                  align="center">
               <cssthrobber id="clearprivacythrobber"/>
             </hbox>
-            <description id="clear-notification-done">&clearPrivateData.done;</description>
+            <description id="clear-notification-done">
+              &clearPrivateData.done;
+            </description>
           </deck>
         </hbox>
       </settings>
-      <setting pref="signon.rememberSignons" title="&optionsHeader.privacy.passwords.label;" type="bool"/>
-      <settings id="prefs-reporting" label="&optionsHeader.reporting.title;">
+      <setting pref="signon.rememberSignons"
+               title="&optionsHeader.privacy.passwords.label;"
+               type="bool"/>
+      <settings id="prefs-reporting"
+                label="&optionsHeader.reporting.title;">
         <setting pref="app.crashreporter.autosubmit"
                  type="bool"
                  title="&optionsHeader.reporting.crashes.label;" />
         <checkbox id="prefs-reporting-submitURLs"
                   cropped="end"
                   label="&optionsHeader.reporting.crashes.submitURLs;"
                   command="cmd_reportingCrashesSubmitURLs"/>
       </settings>
-      <settings id="prefs-telemetry" label="&optionsHeader.telemetry.title;">
+      <settings id="prefs-telemetry"
+                label="&optionsHeader.telemetry.title;">
         <setting
 #ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
           pref="toolkit.telemetry.enabledPreRelease"
 #else
           pref="toolkit.telemetry.enabled"
 #endif
-          type="bool" title="&optionsHeader.telemetry.label;"/>
+          type="bool"
+          title="&optionsHeader.telemetry.label;"/>
       </settings>
-      <settings id="prefs-dnt" label="&doNotTrack.title;">
-        <setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" type="radio" >
+      <settings id="prefs-dnt"
+                label="&doNotTrack.title;">
+        <setting id="prefs-dnt-value"
+                 pref="privacy.donottrackheader.value"
+                 type="radio" >
           <radiogroup id="prefs-dnt-options">
-            <radio id="prefs-dnt-notrack" class="flyoutpanel-hack"
-                   label="&doNotTrack.options.doNotTrack;" value="1"/>
-            <radio id="prefs-dnt-oktrack" class="flyoutpanel-hack"
-                   label="&doNotTrack.options.doTrack;" value="0"/>
-            <radio id="prefs-dnt-nopref" class="flyoutpanel-hack"
-                   label="&doNotTrack.options.default;" value="-1"/>
+            <radio id="prefs-dnt-notrack"
+                   class="flyoutpanel-hack"
+                   label="&doNotTrack.options.doNotTrack;"
+                   value="1"/>
+            <radio id="prefs-dnt-oktrack"
+                   class="flyoutpanel-hack"
+                   label="&doNotTrack.options.doTrack;"
+                   value="0"/>
+            <radio id="prefs-dnt-nopref"
+                   class="flyoutpanel-hack"
+                   label="&doNotTrack.options.default;"
+                   value="-1"/>
           </radiogroup>
         </setting>
-        <label class="text-link" href="https://www.mozilla.org/dnt">&doNotTrack.learnMoreLink;</label>
+        <label class="text-link"
+               href="https://www.mozilla.org/dnt">
+          &doNotTrack.learnMoreLink;
+        </label>
       </settings>
     </flyoutpanel>
-    <flyoutpanel id="search-flyoutpanel" class="flyout-narrow" headertext="&searchFlyoutHeader.title;">
-      <settings id="search-options" label="&searchSetting.title;">
+    <flyoutpanel id="search-flyoutpanel"
+                 class="flyout-narrow"
+                 headertext="&searchFlyoutHeader.title;">
+      <settings id="search-options"
+                label="&searchSetting.title;">
       </settings>
     </flyoutpanel>
 
     <!-- Chrome touch selection overlay -->
-    <box class="selection-overlay-hidden" id="chrome-selection-overlay"/>
+    <box class="selection-overlay-hidden"
+         id="chrome-selection-overlay"/>
 
-    <box onclick="event.stopPropagation();" id="context-container" class="menu-container" hidden="true">
-      <vbox id="context-popup" class="menu-popup">
-        <richlistbox id="context-commands" bindingType="contextmenu" flex="1">
-          <!-- priority="low" items are hidden by default when a context is being displayed
-               for two or more media types. (e.g. a linked image) -->
-          <!-- content types preceeded by '!' act as exclusion rules, the menu item will not
-               be displayed if the content type is present. -->
-          <!-- Note the order of richlistitem here is important as it is reflected in the
-               menu itself. -->
-          <!-- ux spec: https://bug782810.bugzilla.mozilla.org/attachment.cgi?id=714804 -->
+    <box onclick="event.stopPropagation();"
+         id="context-container"
+         class="menu-container"
+         hidden="true">
+      <vbox id="context-popup"
+            class="menu-popup">
+        <richlistbox id="context-commands"
+                     bindingType="contextmenu"
+                     flex="1">
+          <!-- priority="low" items are hidden by default when a context is
+               being displayed for two or more media types. (e.g.
+               a linked image) -->
+          <!-- content types preceeded by '!' act as exclusion rules, the menu
+               item will not be displayed if the content type is present. -->
+          <!-- Note the order of richlistitem here is important as it is
+               reflected in the menu itself. -->
+          <!-- ux spec:
+               https://bug782810.bugzilla.mozilla.org/attachment.cgi?id=714804 -->
 
           <!-- Text related -->
           <!-- for text inputs, this will cut selected text -->
-          <richlistitem id="context-cut" type="cut" onclick="ContextCommands.cut();">
+          <richlistitem id="context-cut"
+                        type="cut"
+                        onclick="ContextCommands.cut();">
             <label value="&contextTextCut.label;"/>
           </richlistitem>
           <!-- for text inputs, this will copy selected text -->
-          <richlistitem id="context-copy" type="copy" onclick="ContextCommands.copy();">
+          <richlistitem id="context-copy"
+                        type="copy"
+                        onclick="ContextCommands.copy();">
             <label value="&contextTextCopy.label;"/>
           </richlistitem>
-          <!-- Search Bing for "(text..)", displayed on selected content text only -->
-          <richlistitem id="context-search" type="selected-text,!input-text" onclick="ContextCommands.searchText(this);">
+          <!-- Search Bing for "(text..)", displayed on selected content text
+              only -->
+          <richlistitem id="context-search"
+                        type="selected-text,!input-text"
+                        onclick="ContextCommands.searchText(this);">
             <label id="context-search-label" value=""/>
           </richlistitem>
           <!-- only displayed in inputs with text that do not have selection -->
-          <richlistitem id="context-select" type="selectable" onclick="ContextCommands.select();">
+          <richlistitem id="context-select"
+                        type="selectable"
+                        onclick="ContextCommands.select();">
             <label value="&contextTextSelect.label;"/>
           </richlistitem>
           <!-- only displayed in inputs with text that do not have selection -->
-          <richlistitem id="context-select-all" type="selectable" onclick="ContextCommands.selectAll();">
+          <richlistitem id="context-select-all"
+                        type="selectable"
+                        onclick="ContextCommands.selectAll();">
             <label value="&contextTextSelectAll.label;"/>
           </richlistitem>
           <!-- only displayed if there is text on the clipboard -->
-          <richlistitem id="context-paste" type="paste" onclick="ContextCommands.paste();">
+          <richlistitem id="context-paste"
+                        type="paste"
+                        onclick="ContextCommands.paste();">
             <label value="&contextTextPaste.label;"/>
           </richlistitem>
-          <!-- only display if there is text on the clipboard and the target is the urlbar -->
-          <richlistitem id="context-paste-n-go" type="paste-url" onclick="ContextCommands.pasteAndGo();">
+          <!-- only display if there is text on the clipboard and the target
+               is the urlbar -->
+          <richlistitem id="context-paste-n-go"
+                        type="paste-url"
+                        onclick="ContextCommands.pasteAndGo();">
             <label value="&contextTextPasteAndGo.label;"/>
           </richlistitem>
 
           <!-- Image related -->
           <!-- save image to user pictures library -->
-          <richlistitem id="context-save-image-lib" type="image" onclick="ContextCommands.saveImageToLib();">
+          <richlistitem id="context-save-image-lib"
+                        type="image"
+                        onclick="ContextCommands.saveImageToLib();">
             <label value="&contextSaveImageLib.label;"/>
           </richlistitem>
           <!-- copy image data to clipboard -->
-          <richlistitem id="context-copy-image" type="image" onclick="ContextCommands.copyImage();">
+          <richlistitem id="context-copy-image"
+                        type="image"
+                        onclick="ContextCommands.copyImage();">
             <label value="&contextCopyImage.label;"/>
           </richlistitem>
           <!-- copy the uri of the image src -->
-          <richlistitem id="context-copy-image-loc" type="image" onclick="ContextCommands.copyImageSrc();">
+          <richlistitem id="context-copy-image-loc"
+                        type="image"
+                        onclick="ContextCommands.copyImageSrc();">
             <label value="&contextCopyImageLocation.label;"/>
           </richlistitem>
           <!-- open the uri of the image src in a new tab -->
-          <richlistitem id="context-open-image-tab" type="image" priority="low" onclick="ContextCommands.openImageInNewTab();">
+          <richlistitem id="context-open-image-tab"
+                        type="image"
+                        priority="low"
+                        onclick="ContextCommands.openImageInNewTab();">
             <label value="&contextOpenImageTab.label;"/>
           </richlistitem>
 
           <!-- Video related -->
           <!-- save video to user videos library -->
-          <richlistitem id="context-save-video-lib" type="video" onclick="ContextCommands.saveVideoToLib();">
+          <richlistitem id="context-save-video-lib"
+                        type="video"
+                        onclick="ContextCommands.saveVideoToLib();">
             <label value="&contextSaveVideoLib.label;"/>
           </richlistitem>
           <!-- copy the uri of the video src -->
-          <richlistitem id="context-copy-video-loc" type="video" onclick="ContextCommands.copyVideoSrc();">
+          <richlistitem id="context-copy-video-loc"
+                        type="video"
+                        onclick="ContextCommands.copyVideoSrc();">
             <label value="&contextCopyVideoLocation.label;"/>
           </richlistitem>
           <!-- open the uri of the video src in a new tab -->
-          <richlistitem id="context-open-video-tab" type="video" priority="low" onclick="ContextCommands.openVideoInNewTab();">
+          <richlistitem id="context-open-video-tab"
+                        type="video"
+                        priority="low"
+                        onclick="ContextCommands.openVideoInNewTab();">
             <label value="&contextOpenVideoTab.label;"/>
           </richlistitem>
 
           <!-- Link related -->
           <!-- all of these apply to underlying link href values -->
-          <richlistitem id="context-open-in-new-tab" type="link" onclick="ContextCommands.openLinkInNewTab();">
+          <richlistitem id="context-open-in-new-tab"
+                        type="link"
+                        onclick="ContextCommands.openLinkInNewTab();">
             <label value="&contextOpenLinkTab.label;"/>
           </richlistitem>
-          <richlistitem id="context-copy-link" type="link" onclick="ContextCommands.copyLink();">
+          <richlistitem id="context-copy-link"
+                        type="link"
+                        onclick="ContextCommands.copyLink();">
             <label value="&contextCopyLinkHref.label;"/>
           </richlistitem>
-          <richlistitem id="context-bookmark-link" type="link" priority="low" onclick="ContextCommands.bookmarkLink();">
+          <richlistitem id="context-bookmark-link"
+                        type="link"
+                        priority="low"
+                        onclick="ContextCommands.bookmarkLink();">
             <label value="&contextBookmarkLinkHref.label;"/>
           </richlistitem>
 
           <!-- App bar: 'more' button context menu -->
           <!-- developer buttons - shown in metrodesktop mode only -->
-          <richlistitem id="context-error-console" type="open-error-console" onclick="ContextCommands.errorConsole();">
+          <richlistitem id="context-error-console"
+                        type="open-error-console"
+                        onclick="ContextCommands.errorConsole();">
             <label value="&appbarErrorConsole.label;"/>
           </richlistitem>
-          <richlistitem id="context-jsshell" type="open-jsshell" onclick="ContextCommands.jsShell();">
+          <richlistitem id="context-jsshell"
+                        type="open-jsshell"
+                        onclick="ContextCommands.jsShell();">
             <label value="&appbarJSShell.label;"/>
           </richlistitem>
 
           <!-- standard buttons -->
-          <richlistitem id="context-newprivatetab" type="private-browsing" onclick="BrowserUI.addAndShowPrivateTab()">
+          <richlistitem id="context-newprivatetab"
+                        type="private-browsing"
+                        onclick="BrowserUI.addAndShowPrivateTab()">
             <label value="&newPrivateTab.label;"/>
           </richlistitem>
-          <richlistitem id="context-findinpage" type="find-in-page" onclick="ContextCommands.findInPage();">
+          <richlistitem id="context-findinpage"
+                        type="find-in-page"
+                        onclick="ContextCommands.findInPage();">
             <label value="&appbarFindInPage2.label;"/>
           </richlistitem>
-          <richlistitem id="context-viewondesktop" type="view-on-desktop" onclick="ContextCommands.viewOnDesktop();">
+          <richlistitem id="context-viewondesktop"
+                        type="view-on-desktop"
+                        onclick="ContextCommands.viewOnDesktop();">
             <label value="&appbarRelaunchInDesktop.label;"/>
           </richlistitem>
-          <richlistitem id="context-msmetadata" type="ms-meta-data" onclick="ContextCommands.openWindowsStoreLink();">
+          <richlistitem id="context-msmetadata"
+                        type="ms-meta-data"
+                        onclick="ContextCommands.openWindowsStoreLink();">
             <label value="&appbarMSMetaData2.label;"/>
           </richlistitem>
-          <richlistitem id="context-viewpagesource" type="view-page-source" onclick="ContextCommands.viewPageSource();">
+          <richlistitem id="context-viewpagesource"
+                        type="view-page-source"
+                        onclick="ContextCommands.viewPageSource();">
             <label value="&appbarViewPageSource.label;"/>
           </richlistitem>
         </richlistbox>
       </vbox>
     </box>
 
-    <vbox id="select-container" class="menu-container" hidden="true">
-      <vbox id="select-popup" class="select-popup">
-        <richlistbox id="select-commands" flex="1"/>
+    <vbox id="select-container"
+          class="menu-container"
+          hidden="true">
+      <vbox id="select-popup"
+            class="select-popup">
+        <richlistbox id="select-commands"
+                     flex="1"/>
       </vbox>
     </vbox>
 
-    <box id="menucontrol-container" class="menu-container" hidden="true">
-      <vbox id="menucontrol-popup" class="menu-popup">
-        <richlistbox id="menupopup-commands" onclick="if (event.target != this) MenuControlUI.selectByIndex(this.selectedIndex);" flex="1"/>
+    <box id="menucontrol-container"
+         class="menu-container"
+         hidden="true">
+      <vbox id="menucontrol-popup"
+            class="menu-popup">
+        <richlistbox id="menupopup-commands"
+                     onclick="if (event.target != this) MenuControlUI.selectByIndex(this.selectedIndex);"
+                     flex="1"/>
       </vbox>
     </box>
 
-    <box id="autofill-container" class="menu-container" hidden="true">
-      <vbox id="autofill-popup" class="menu-popup">
-        <richlistbox id="menupopup-commands" onclick="if (event.target != this) AutofillMenuUI.selectByIndex(this.selectedIndex);" flex="1"/>
+    <box id="autofill-container"
+         class="menu-container"
+         hidden="true">
+      <vbox id="autofill-popup"
+            class="menu-popup">
+        <richlistbox id="menupopup-commands"
+                     onclick="if (event.target != this) AutofillMenuUI.selectByIndex(this.selectedIndex);"
+                     flex="1"/>
       </vbox>
     </box>
   </stack>
 
 </window>