Merge fx-team to m-c. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 03 Oct 2014 16:13:24 -0400
changeset 233264 229801d17f7e24e2cb5ad368b553994f1482d4bb
parent 233247 2f69737e5b1c013845ec6e7446cc2c9c25458717 (current diff)
parent 233263 2e23b87a9f6a75d4e8fecaf1abe7a48a6f5db1a4 (diff)
child 233265 b3fb5bdc588c94fbaf79433fbf01168cdfb6cc99
child 233279 b55a1862af311e41171fb0440888e74463ace0b0
child 233318 df6a28be0934211d82f539b1b42ae4e446b39a41
child 233383 0aa4a97aa8f39cca56a7d736547f8a5cd09a4bf0
push id611
push userraliiev@mozilla.com
push dateMon, 05 Jan 2015 23:23:16 +0000
treeherdermozilla-release@345cd3b9c445 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone35.0a1
first release with
nightly linux32
229801d17f7e / 35.0a1 / 20141004030203 / files
nightly linux64
229801d17f7e / 35.0a1 / 20141004030203 / files
nightly mac
229801d17f7e / 35.0a1 / 20141004030203 / files
nightly win32
229801d17f7e / 35.0a1 / 20141004030203 / files
nightly win64
229801d17f7e / 35.0a1 / 20141004030203 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge fx-team to m-c. a=merge
configure.in
mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_menu.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_menu.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_divider.xml
mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_menu.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_menu.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-mdpi-v11/ic_menu_back.png
mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
mobile/android/base/resources/layout-large-v11/new_tablet_tabs_counter.xml
mobile/android/base/resources/layout-large-v11/tab_strip.xml
mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
mobile/android/base/resources/layout/tabs_panel.xml
mobile/android/base/resources/layout/tabs_panel_header.xml
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -247,16 +247,21 @@ toolbar[customizing] > .overflow-button 
 %ifdef XP_WIN
 #main-window[sizemode="maximized"] #titlebar-buttonbox {
   -moz-appearance: -moz-window-button-box-maximized;
 }
 %endif
 
 %endif
 
+#main-window[inFullscreen] #global-notificationbox,
+#main-window[inFullscreen] #high-priority-global-notificationbox {
+  visibility: collapse;
+}
+
 /* Rules to help integrate SDK widgets */
 toolbaritem[sdkstylewidget="true"] > toolbarbutton,
 toolbarpaletteitem > toolbaritem[sdkstylewidget="true"] > iframe,
 toolbarpaletteitem > toolbaritem[sdkstylewidget="true"] > .toolbarbutton-text {
   display: none;
 }
 
 toolbarpaletteitem:-moz-any([place="palette"], [place="panel"]) > toolbaritem[sdkstylewidget="true"] > toolbarbutton {
@@ -819,33 +824,25 @@ html|*#gcli-output-frame,
 .browserStack[responsivemode] {
   transition-property: min-width, max-width, min-height, max-height;
 }
 
 .browserStack[responsivemode][notransition] {
   transition: none;
 }
 
-.toolbarbutton-badge[badge]:not([badge=""])::after {
-  content: attr(badge);
-}
-
-toolbarbutton[type="badged"] {
-  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#toolbarbutton-badged");
-}
-
 toolbarbutton[type="socialmark"] {
   -moz-binding: url("chrome://browser/content/socialmarks.xml#toolbarbutton-marks");
 }
 
-toolbarbutton[type="badged"] > .toolbarbutton-badge-container > .toolbarbutton-icon,
+toolbarbutton.badged-button > .toolbarbutton-badge-container > .toolbarbutton-icon,
 toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   max-width: 16px;
 }
-toolbarpaletteitem[place="palette"] > toolbarbutton[type="badged"] > .toolbarbutton-badge-container > .toolbarbutton-icon {
+toolbarpaletteitem[place="palette"] > toolbarbutton.badged-button > .toolbarbutton-badge-container > .toolbarbutton-icon {
   max-width: 32px;
 }
 
 panelview > .social-panel-frame {
   width: auto;
   height: auto;
 }
 
--- a/browser/base/content/newtab/newTab.xul
+++ b/browser/base/content/newtab/newTab.xul
@@ -91,12 +91,12 @@
     </div>
 
     <div id="newtab-intro-what">&newtab.customize.what;</div>
 
     <input id="newtab-customize-button" type="button" title="&newtab.customize.title;"/>
   </div>
 
   <xul:script type="text/javascript;version=1.8"
-              src="chrome://browser/content/newtab/newTab.js"/>
+              src="chrome://browser/content/searchSuggestionUI.js"/>
   <xul:script type="text/javascript;version=1.8"
-              src="chrome://browser/content/searchSuggestionUI.js"/>
+              src="chrome://browser/content/newtab/newTab.js"/>
 </xul:window>
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -2576,25 +2576,9 @@
               this._promomessage.firstChild.textContent = this._notificationMessage;
               this._promomessage.height = this._promomessage.getBoundingClientRect().height;
             }.bind(this), true);
           }
         ]]></body>
       </method>
     </implementation>
   </binding>
-
-  <binding id="toolbarbutton-badged" display="xul:button"
-           extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-    <content>
-      <children includes="observes|template|menupopup|panel|tooltip"/>
-      <xul:hbox class="toolbarbutton-badge-container" align="start" pack="end">
-        <xul:hbox class="toolbarbutton-badge" xbl:inherits="badge"/>
-        <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
-      </xul:hbox>
-      <xul:label class="toolbarbutton-text" crop="right" flex="1"
-                 xbl:inherits="value=label,accesskey,crop,wrap"/>
-      <xul:label class="toolbarbutton-multiline-text" flex="1"
-                 xbl:inherits="xbl:text=label,accesskey,wrap"/>
-    </content>
-  </binding>
-
 </bindings>
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -910,17 +910,17 @@ const CustomizableWidgets = [
     tooltiptext: "loop-call-button.tooltiptext",
     defaultArea: CustomizableUI.AREA_NAVBAR,
     introducedInVersion: 1,
     onBuild: function(aDocument) {
       let node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
       node.setAttribute("id", this.id);
       node.classList.add("toolbarbutton-1");
       node.classList.add("chromeclass-toolbar-additional");
-      node.setAttribute("type", "badged");
+      node.classList.add("badged-button");
       node.setAttribute("label", CustomizableUI.getLocalizedProperty(this, "label"));
       node.setAttribute("tooltiptext", CustomizableUI.getLocalizedProperty(this, "tooltiptext"));
       node.setAttribute("removable", "true");
       node.addEventListener("command", function(event) {
         aDocument.defaultView.LoopUI.openCallPanel(event);
       });
       return node;
     }
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -108,16 +108,17 @@ skip-if = e10s # Bug ?????? - test uses 
 [browser_967000_button_tabView.js]
 [browser_968447_bookmarks_toolbar_items_in_panel.js]
 skip-if = os == "linux" # Intemittent failures - bug 979207
 [browser_968565_insert_before_hidden_items.js]
 [browser_969427_recreate_destroyed_widget_after_reset.js]
 [browser_969661_character_encoding_navbar_disabled.js]
 [browser_970511_undo_restore_default.js]
 [browser_972267_customizationchange_events.js]
+[browser_973641_button_addon.js]
 [browser_973932_addonbar_currentset.js]
 [browser_975719_customtoolbars_behaviour.js]
 
 [browser_976792_insertNodeInWindow.js]
 skip-if = os == "linux"
 
 [browser_978084_dragEnd_after_move.js]
 [browser_980155_add_overflow_toolbar.js]
new file mode 100755
--- /dev/null
+++ b/browser/components/customizableui/test/browser_973641_button_addon.js
@@ -0,0 +1,72 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const kButton = "test_button_for_addon";
+let initialLocation = gBrowser.currentURI.spec;
+
+add_task(function() {
+  info("Check addon button functionality");
+
+  // create mocked addon button on the navigation bar
+  let widgetSpec = {
+    id: kButton,
+    type: 'button',
+    onClick: function() {
+      gBrowser.selectedTab = gBrowser.addTab("about:addons");
+    }
+  };
+  CustomizableUI.createWidget(widgetSpec);
+  CustomizableUI.addWidgetToArea(kButton, CustomizableUI.AREA_NAVBAR);
+
+  // check the button's functionality in navigation bar
+  let addonButton = document.getElementById(kButton);
+  let navBar = document.getElementById("nav-bar");
+  ok(addonButton, "Addon button exists");
+  ok(navBar.contains(addonButton), "Addon button is in the navbar");
+  yield checkButtonFunctionality(addonButton);
+
+  resetTabs();
+
+  //move the add-on button in the Panel Menu
+  CustomizableUI.addWidgetToArea(kButton, CustomizableUI.AREA_PANEL);
+  let addonButtonInNavbar = navBar.getElementsByAttribute("id", kButton);
+  ok(!navBar.contains(addonButton), "Addon button was removed from the browser bar");
+
+  // check the addon button's functionality in the Panel Menu
+  yield PanelUI.show();
+  var panelMenu = document.getElementById("PanelUI-mainView");
+  let addonButtonInPanel = panelMenu.getElementsByAttribute("id", kButton);
+  ok(panelMenu.contains(addonButton), "Addon button was added to the Panel Menu");
+  yield checkButtonFunctionality(addonButtonInPanel[0]);
+});
+
+add_task(function asyncCleanup() {
+  resetTabs();
+
+  // reset the UI to the default state
+  yield resetCustomization();
+  ok(CustomizableUI.inDefaultState, "The UI is in default state again.");
+
+  // destroy the widget
+  CustomizableUI.destroyWidget(kButton);
+});
+
+function resetTabs() {
+  //close all opened tabs
+  while(gBrowser.tabs.length > 1) {
+    gBrowser.removeTab(gBrowser.selectedTab);
+  }
+
+  //restore the initial tab
+  gBrowser.addTab(initialLocation);
+  gBrowser.removeTab(gBrowser.selectedTab);
+}
+
+function checkButtonFunctionality(aButton) {
+  aButton.click();
+  yield waitForCondition(() => gBrowser.currentURI &&
+                               gBrowser.currentURI.spec == "about:addons");
+}
--- a/browser/devtools/app-manager/content/index.js
+++ b/browser/devtools/app-manager/content/index.js
@@ -1,20 +1,21 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const Cu = Components.utils;
+const {utils: Cu, interfaces: Ci} = Components;
 Cu.import("resource:///modules/devtools/gDevTools.jsm");
 const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const {require} = devtools;
 const {ConnectionManager, Connection} = require("devtools/client/connection-manager");
 const promise = require("devtools/toolkit/deprecated-sync-thenables");
-const prefs = require('sdk/preferences/service');
-
+const prefs = require("sdk/preferences/service");
+const Services = require("Services");
+const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/app-manager.properties");
 
 let UI = {
   _toolboxTabCursor: 0,
   _handledTargets: new Map(),
 
   connection: null,
 
   init: function() {
@@ -29,16 +30,17 @@ let UI = {
     window.addEventListener("message", this.onMessage);
   },
 
   onLoad: function() {
     window.removeEventListener("load", this.onLoad);
     let defaultPanel = prefs.get("devtools.appmanager.lastTab");
     let panelExists = !!document.querySelector("." + defaultPanel  + "-panel");
     this.selectTab(panelExists ? defaultPanel : "projects");
+    this.showDeprecationNotice();
   },
 
   onUnload: function() {
     for (let [target, toolbox] of this._handledTargets) {
       toolbox.destroy();
     }
 
     window.removeEventListener("unload", this.onUnload);
@@ -173,12 +175,38 @@ let UI = {
         this._handledTargets.set(target, toolbox);
         toolbox.once("destroyed", () => {
           this._handledTargets.delete(target)
         });
       });
     } else {
       return gDevTools.showToolbox(target, null, host);
     }
+  },
+
+  showDeprecationNotice: function() {
+    let message = Strings.GetStringFromName("index.deprecationNotice");
+
+    let buttons = [
+      {
+        label: Strings.GetStringFromName("index.launchWebIDE"),
+        callback: gDevToolsBrowser.openWebIDE
+      },
+      {
+        label: Strings.GetStringFromName("index.readMoreAboutWebIDE"),
+        callback: () => {
+          window.open("https://developer.mozilla.org/docs/Tools/WebIDE");
+        }
+      }
+    ];
+
+    let docShell = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                   .getInterface(Ci.nsIWebNavigation)
+                   .QueryInterface(Ci.nsIDocShell);
+    let browser = docShell.chromeEventHandler;
+    let nbox = browser.ownerDocument.defaultView.gBrowser
+               .getNotificationBox(browser);
+    nbox.appendNotification(message, "app-manager-deprecation", null,
+                            nbox.PRIORITY_WARNING_LOW, buttons);
   }
-}
+};
 
 UI.init();
--- a/browser/devtools/netmonitor/netmonitor-view.js
+++ b/browser/devtools/netmonitor/netmonitor-view.js
@@ -365,30 +365,33 @@ RequestsMenuView.prototype = Heritage.ex
     this.requestsMenuSortEvent = getKeyWithEvent(this.sortBy.bind(this));
     this.requestsMenuFilterEvent = getKeyWithEvent(this.filterOn.bind(this));
     this.reqeustsMenuClearEvent = this.clear.bind(this);
     this._onContextShowing = this._onContextShowing.bind(this);
     this._onContextNewTabCommand = this.openRequestInTab.bind(this);
     this._onContextCopyUrlCommand = this.copyUrl.bind(this);
     this._onContextCopyImageAsDataUriCommand = this.copyImageAsDataUri.bind(this);
     this._onContextResendCommand = this.cloneSelectedRequest.bind(this);
+    this._onContextToggleRawHeadersCommand = this.toggleRawHeaders.bind(this);
     this._onContextPerfCommand = () => NetMonitorView.toggleFrontendMode();
     this._onReloadCommand = () => NetMonitorView.reloadPage();
 
     this.sendCustomRequestEvent = this.sendCustomRequest.bind(this);
     this.closeCustomRequestEvent = this.closeCustomRequest.bind(this);
     this.cloneSelectedRequestEvent = this.cloneSelectedRequest.bind(this);
+    this.toggleRawHeadersEvent = this.toggleRawHeaders.bind(this);
 
     $("#toolbar-labels").addEventListener("click", this.requestsMenuSortEvent, false);
     $("#requests-menu-footer").addEventListener("click", this.requestsMenuFilterEvent, false);
     $("#requests-menu-clear-button").addEventListener("click", this.reqeustsMenuClearEvent, false);
     $("#network-request-popup").addEventListener("popupshowing", this._onContextShowing, false);
     $("#request-menu-context-newtab").addEventListener("command", this._onContextNewTabCommand, false);
     $("#request-menu-context-copy-url").addEventListener("command", this._onContextCopyUrlCommand, false);
     $("#request-menu-context-copy-image-as-data-uri").addEventListener("command", this._onContextCopyImageAsDataUriCommand, false);
+    $("#toggle-raw-headers").addEventListener("click", this.toggleRawHeadersEvent, false);
 
     window.once("connected", this._onConnect.bind(this));
   },
 
   _onConnect: function() {
     $("#requests-menu-reload-notice-button").addEventListener("command", this._onReloadCommand, false);
 
     if (NetMonitorController.supportsCustomRequest) {
@@ -442,16 +445,17 @@ RequestsMenuView.prototype = Heritage.ex
     $("#requests-menu-perf-notice-button").removeEventListener("command", this._onContextPerfCommand, false);
     $("#requests-menu-network-summary-button").removeEventListener("command", this._onContextPerfCommand, false);
     $("#requests-menu-network-summary-label").removeEventListener("click", this._onContextPerfCommand, false);
     $("#network-statistics-back-button").removeEventListener("command", this._onContextPerfCommand, false);
 
     $("#custom-request-send-button").removeEventListener("click", this.sendCustomRequestEvent, false);
     $("#custom-request-close-button").removeEventListener("click", this.closeCustomRequestEvent, false);
     $("#headers-summary-resend").removeEventListener("click", this.cloneSelectedRequestEvent, false);
+    $("#toggle-raw-headers").removeEventListener("click", this.toggleRawHeadersEvent, false);
   },
 
   /**
    * Resets this container (removes all the networking information).
    */
   reset: function() {
     this.empty();
     this._firstRequestStartedMillis = -1;
@@ -634,16 +638,38 @@ RequestsMenuView.prototype = Heritage.ex
    * Remove the currently selected custom request.
    */
   closeCustomRequest: function() {
     this.remove(this.selectedItem);
     NetMonitorView.Sidebar.toggle(false);
   },
 
   /**
+   * Shows raw request/response headers in textboxes.
+   */
+  toggleRawHeaders: function() {
+    let requestTextarea = $("#raw-request-headers-textarea");
+    let responseTextare = $("#raw-response-headers-textarea");
+    let rawHeadersHidden = $("#raw-headers").getAttribute("hidden");
+
+    if (rawHeadersHidden) {
+      let selected = this.selectedItem.attachment;
+      let selectedRequestHeaders = selected.requestHeaders.headers;
+      let selectedResponseHeaders = selected.responseHeaders.headers;
+      requestTextarea.value = writeHeaderText(selectedRequestHeaders);
+      responseTextare.value = writeHeaderText(selectedResponseHeaders);
+      $("#raw-headers").hidden = false;
+    } else {
+      requestTextarea.value = null;
+      responseTextare.value = null;
+      $("#raw-headers").hidden = true;
+    }
+  },
+
+  /**
    * Filters all network requests in this container by a specified type.
    *
    * @param string aType
    *        Either "all", "html", "css", "js", "xhr", "fonts", "images", "media"
    *        "flash" or "other".
    */
   filterOn: function(aType = "all") {
     if (aType === "all") {
@@ -2008,16 +2034,17 @@ NetworkDetailsView.prototype = {
    */
   populate: function(aData) {
     $("#request-params-box").setAttribute("flex", "1");
     $("#request-params-box").hidden = false;
     $("#request-post-data-textarea-box").hidden = true;
     $("#response-content-info-header").hidden = true;
     $("#response-content-json-box").hidden = true;
     $("#response-content-textarea-box").hidden = true;
+    $("#raw-headers").hidden = true;
     $("#response-content-image-box").hidden = true;
 
     let isHtml = RequestsMenuView.prototype.isHtml({ attachment: aData });
 
     // Show the "Preview" tabpanel only for plain HTML responses.
     $("#preview-tab").hidden = !isHtml;
     $("#preview-tabpanel").hidden = !isHtml;
 
--- a/browser/devtools/netmonitor/netmonitor.xul
+++ b/browser/devtools/netmonitor/netmonitor.xul
@@ -302,27 +302,49 @@
                          class="requests-menu-status"/>
                     <label id="headers-summary-status-value"
                            class="plain tabpanel-summary-value devtools-monospace"
                            crop="end"
                            flex="1"/>
                     <button id="headers-summary-resend"
                             class="devtools-toolbarbutton"
                             label="&netmonitorUI.summary.editAndResend;"/>
+                    <button id="toggle-raw-headers"
+                            class="devtools-toolbarbutton"
+                            label="&netmonitorUI.summary.rawHeaders;"/>
                   </hbox>
                   <hbox id="headers-summary-version"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
                            value="&netmonitorUI.summary.version;"/>
                     <label id="headers-summary-version-value"
                            class="plain tabpanel-summary-value devtools-monospace"
                            crop="end"
                            flex="1"/>
                   </hbox>
+                  <hbox id="raw-headers"
+                        class="tabpanel-summary-container"
+                        align="center"
+                        hidden="true">
+                    <vbox id="raw-request-headers-textarea-box" flex="1" hidden="false">
+                      <label class="plain tabpanel-summary-label"
+                        value="&netmonitorUI.summary.rawHeaders.requestHeaders;"/>
+                      <textbox id="raw-request-headers-textarea"
+                        class="raw-response-textarea"
+                        flex="1" multiline="true" readonly="true"/>
+                    </vbox>
+                    <vbox id="raw-response-headers-textarea-box" flex="1" hidden="false">
+                      <label class="plain tabpanel-summary-label"
+                        value="&netmonitorUI.summary.rawHeaders.responseHeaders;"/>
+                      <textbox id="raw-response-headers-textarea"
+                        class="raw-response-textarea"
+                        flex="1" multiline="true" readonly="true"/>
+                    </vbox>
+                  </hbox>
                   <vbox id="all-headers" flex="1"/>
                 </vbox>
               </tabpanel>
               <tabpanel id="cookies-tabpanel"
                         class="tabpanel-content">
                 <vbox flex="1">
                   <vbox id="all-cookies" flex="1"/>
                 </vbox>
--- a/browser/devtools/netmonitor/test/browser.ini
+++ b/browser/devtools/netmonitor/test/browser.ini
@@ -72,16 +72,17 @@ skip-if= buildapp == 'mulet'
 [browser_net_page-nav.js]
 [browser_net_pane-collapse.js]
 [browser_net_pane-toggle.js]
 [browser_net_post-data-01.js]
 [browser_net_post-data-02.js]
 [browser_net_post-data-03.js]
 [browser_net_prefs-and-l10n.js]
 [browser_net_prefs-reload.js]
+[browser_net_raw_headers.js]
 [browser_net_reload-button.js]
 [browser_net_req-resp-bodies.js]
 [browser_net_resend.js]
 [browser_net_simple-init.js]
 [browser_net_simple-request-data.js]
 [browser_net_simple-request-details.js]
 [browser_net_simple-request.js]
 [browser_net_sort-01.js]
new file mode 100644
--- /dev/null
+++ b/browser/devtools/netmonitor/test/browser_net_raw_headers.js
@@ -0,0 +1,72 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let gPanelWin;
+let gPanelDoc;
+
+/**
+ * Tests if showing raw headers works.
+ */
+
+function test() {
+  initNetMonitor(POST_DATA_URL).then(([aTab, aDebuggee, aMonitor]) => {
+    info("Starting test... ");
+
+    gPanelWin = aMonitor.panelWin;
+    gPanelDoc = gPanelWin.document;
+
+    let { document, Editor, NetMonitorView } = gPanelWin;
+    let { RequestsMenu } = NetMonitorView;
+    let TAB_UPDATED = gPanelWin.EVENTS.TAB_UPDATED;
+
+    RequestsMenu.lazyUpdate = false;
+
+    waitForNetworkEvents(aMonitor, 0, 2).then(() => {
+      let origItem = RequestsMenu.getItemAtIndex(0);
+      RequestsMenu.selectedItem = origItem;
+
+      waitFor(aMonitor.panelWin, TAB_UPDATED).then(() => {
+        EventUtils.sendMouseEvent({ type: "click" }, document.getElementById("toggle-raw-headers"));
+        testShowRawHeaders(origItem.attachment);
+        EventUtils.sendMouseEvent({ type: "click" }, document.getElementById("toggle-raw-headers"));
+        testHideRawHeaders(document);
+        finishUp(aMonitor);
+      });
+    });
+
+    aDebuggee.performRequests();
+  });
+}
+
+/*
+ * Tests that raw headers were displayed correctly
+ */
+function testShowRawHeaders(aData) {
+  let requestHeaders = gPanelDoc.getElementById("raw-request-headers-textarea").value;
+  for (let header of aData.requestHeaders.headers) {
+    ok(requestHeaders.indexOf(header.name + ": " + header.value) >= 0, "textarea contains request headers");
+  }
+  let responseHeaders = gPanelDoc.getElementById("raw-response-headers-textarea").value;
+  for (let header of aData.responseHeaders.headers) {
+    ok(responseHeaders.indexOf(header.name + ": " + header.value) >= 0, "textarea contains response headers");
+  }
+}
+
+/*
+ * Tests that raw headers textareas are hidden and empty
+ */
+function testHideRawHeaders(document) {
+  let rawHeadersHidden = document.getElementById("raw-headers").getAttribute("hidden");
+  let requestTextarea = document.getElementById("raw-request-headers-textarea");
+  let responseTextare = document.getElementById("raw-response-headers-textarea");
+  ok(rawHeadersHidden, "raw headers textareas are hidden");
+  ok(requestTextarea.value == '', "raw request headers textarea is empty");
+  ok(responseTextare.value == '', "raw response headers textarea is empty");
+}
+
+function finishUp(aMonitor) {
+  gPanelWin = null;
+  gPanelDoc = null;
+
+  teardown(aMonitor).then(finish);
+}
--- a/browser/devtools/profiler/profiler.xul
+++ b/browser/devtools/profiler/profiler.xul
@@ -102,21 +102,29 @@
     <tabpanel id="profile-content-tabpanel-template">
       <vbox class="framerate"/>
       <vbox class="categories"/>
       <vbox class="call-tree" flex="1">
         <hbox class="call-tree-headers-container">
           <label class="plain call-tree-header"
                  type="duration"
                  crop="end"
-                 value="&profilerUI.table.duration;"/>
+                 value="&profilerUI.table.totalDuration;"/>
+          <label class="plain call-tree-header"
+                 type="self-duration"
+                 crop="end"
+                 value="&profilerUI.table.selfDuration;"/>
           <label class="plain call-tree-header"
                  type="percentage"
                  crop="end"
-                 value="&profilerUI.table.percentage;"/>
+                 value="&profilerUI.table.totalPercentage;"/>
+          <label class="plain call-tree-header"
+                 type="self-percentage"
+                 crop="end"
+                 value="&profilerUI.table.selfPercentage;"/>
           <label class="plain call-tree-header"
                  type="samples"
                  crop="end"
                  value="&profilerUI.table.samples;"/>
           <label class="plain call-tree-header"
                  type="function"
                  crop="end"
                  value="&profilerUI.table.function;"/>
--- a/browser/devtools/profiler/test/browser_profiler_tree-view-01.js
+++ b/browser/devtools/profiler/test/browser_profiler_tree-view-01.js
@@ -17,39 +17,49 @@ function test() {
   treeRoot.autoExpandDepth = 0;
   treeRoot.attachTo(container);
 
   is(container.childNodes.length, 1,
     "The container node should have one child available.");
   is(container.childNodes[0].className, "call-tree-item",
     "The root node in the tree has the correct class name.");
 
-  is(container.childNodes[0].childNodes.length, 4,
+  is(container.childNodes[0].childNodes.length, 6,
     "The root node in the tree has the correct number of children.");
-  is(container.childNodes[0].querySelectorAll(".call-tree-cell").length, 4,
+  is(container.childNodes[0].querySelectorAll(".call-tree-cell").length, 6,
     "The root node in the tree has only 'call-tree-cell' children.");
 
   is(container.childNodes[0].childNodes[0].getAttribute("type"), "duration",
     "The root node in the tree has a duration cell.");
   is(container.childNodes[0].childNodes[0].getAttribute("value"), "18",
     "The root node in the tree has the correct duration cell value.");
 
-  is(container.childNodes[0].childNodes[1].getAttribute("type"), "percentage",
+  is(container.childNodes[0].childNodes[1].getAttribute("type"), "self-duration",
+    "The root node in the tree has a self-duration cell.");
+  is(container.childNodes[0].childNodes[1].getAttribute("value"), "0",
+    "The root node in the tree has the correct self-duration cell value.");
+
+  is(container.childNodes[0].childNodes[2].getAttribute("type"), "percentage",
     "The root node in the tree has a percentage cell.");
-  is(container.childNodes[0].childNodes[1].getAttribute("value"), "100%",
+  is(container.childNodes[0].childNodes[2].getAttribute("value"), "100%",
     "The root node in the tree has the correct percentage cell value.");
 
-  is(container.childNodes[0].childNodes[2].getAttribute("type"), "samples",
+  is(container.childNodes[0].childNodes[3].getAttribute("type"), "self-percentage",
+    "The root node in the tree has a self-percentage cell.");
+  is(container.childNodes[0].childNodes[3].getAttribute("value"), "0%",
+    "The root node in the tree has the correct self-percentage cell value.");
+
+  is(container.childNodes[0].childNodes[4].getAttribute("type"), "samples",
     "The root node in the tree has an samples cell.");
-  is(container.childNodes[0].childNodes[2].getAttribute("value"), "3",
+  is(container.childNodes[0].childNodes[4].getAttribute("value"), "3",
     "The root node in the tree has the correct samples cell value.");
 
-  is(container.childNodes[0].childNodes[3].getAttribute("type"), "function",
+  is(container.childNodes[0].childNodes[5].getAttribute("type"), "function",
     "The root node in the tree has a function cell.");
-  is(container.childNodes[0].childNodes[3].style.MozMarginStart, "0px",
+  is(container.childNodes[0].childNodes[5].style.MozMarginStart, "0px",
     "The root node in the tree has the correct indentation.");
 
   finish();
 }
 
 let gSamples = [{
   time: 5,
   frames: [
--- a/browser/devtools/profiler/test/browser_profiler_tree-view-04.js
+++ b/browser/devtools/profiler/test/browser_profiler_tree-view-04.js
@@ -37,28 +37,32 @@ function test() {
     "The .A.B.C node's 'category' attribute is correct.");
   is(C.target.getAttribute("tooltiptext"), "D (http://foo/bar/baz:78)",
     "The .A.B.C node's 'tooltiptext' attribute is correct.");
   ok(!A.target.querySelector(".call-tree-zoom").hidden,
     "The .A.B.C node's zoom button cell should not be hidden.");
   ok(!A.target.querySelector(".call-tree-category").hidden,
     "The .A.B.C node's category label cell should not be hidden.");
 
-  is(C.target.childNodes.length, 4,
+  is(C.target.childNodes.length, 6,
     "The number of columns displayed for tree items is correct.");
   is(C.target.childNodes[0].getAttribute("type"), "duration",
     "The first column displayed for tree items is correct.");
-  is(C.target.childNodes[1].getAttribute("type"), "percentage",
+  is(C.target.childNodes[1].getAttribute("type"), "self-duration",
     "The second column displayed for tree items is correct.");
-  is(C.target.childNodes[2].getAttribute("type"), "samples",
+  is(C.target.childNodes[2].getAttribute("type"), "percentage",
     "The third column displayed for tree items is correct.");
-  is(C.target.childNodes[3].getAttribute("type"), "function",
+  is(C.target.childNodes[3].getAttribute("type"), "self-percentage",
     "The fourth column displayed for tree items is correct.");
+  is(C.target.childNodes[4].getAttribute("type"), "samples",
+    "The fifth column displayed for tree items is correct.");
+  is(C.target.childNodes[5].getAttribute("type"), "function",
+    "The sixth column displayed for tree items is correct.");
 
-  let functionCell = C.target.childNodes[3];
+  let functionCell = C.target.childNodes[5];
 
   is(functionCell.childNodes.length, 8,
     "The number of columns displayed for function cells is correct.");
   is(functionCell.childNodes[0].className, "arrow theme-twisty",
     "The first node displayed for function cells is correct.");
   is(functionCell.childNodes[1].className, "plain call-tree-name",
     "The second node displayed for function cells is correct.");
   is(functionCell.childNodes[2].className, "plain call-tree-url",
--- a/browser/devtools/profiler/utils/tree-view.js
+++ b/browser/devtools/profiler/utils/tree-view.js
@@ -13,16 +13,19 @@ loader.lazyImporter(this, "Heritage",
 loader.lazyImporter(this, "AbstractTreeItem",
   "resource:///modules/devtools/AbstractTreeItem.jsm");
 
 const URL_LABEL_TOOLTIP = L10N.getStr("table.url.tooltiptext");
 const ZOOM_BUTTON_TOOLTIP = L10N.getStr("table.zoom.tooltiptext");
 const CALL_TREE_INDENTATION = 16; // px
 const CALL_TREE_AUTO_EXPAND = 3; // depth
 
+const clamp = (val, min, max) => Math.max(min, Math.min(max, val));
+const sum = vals => vals.reduce((a, b) => a + b, 0);
+
 exports.CallView = CallView;
 
 /**
  * An item in a call tree view, which looks like this:
  *
  *   Time (ms)  |   Cost   | Calls | Function
  * ============================================================================
  *     1,000.00 |  100.00% |       | â–¼ (root)
@@ -58,79 +61,102 @@ CallView.prototype = Heritage.extend(Abs
    * @param nsIDOMNode document
    * @param nsIDOMNode arrowNode
    * @return nsIDOMNode
    */
   _displaySelf: function(document, arrowNode) {
     this.document = document;
 
     let frameInfo = this.frame.getInfo();
-    let framePercentage = this.frame.samples / this.root.frame.samples * 100;
+    let framePercentage = this._getPercentage(this.frame.samples);
+    let childrenPercentage = sum([this._getPercentage(c.samples)
+                                  for (c of this._getChildCalls())]);
+    let selfPercentage = clamp(framePercentage - childrenPercentage, 0, 100);
+    let selfDuration = this.frame.duration - sum([c.duration
+                                                  for (c of this._getChildCalls())]);
 
     let durationCell = this._createTimeCell(this.frame.duration);
+    let selfDurationCell = this._createTimeCell(selfDuration, true);
     let percentageCell = this._createExecutionCell(framePercentage);
+    let selfPercentageCell = this._createExecutionCell(selfPercentage, true);
     let samplesCell = this._createSamplesCell(this.frame.samples);
     let functionCell = this._createFunctionCell(arrowNode, frameInfo, this.level);
 
     let targetNode = document.createElement("hbox");
     targetNode.className = "call-tree-item";
     targetNode.setAttribute("origin", frameInfo.isContent ? "content" : "chrome");
     targetNode.setAttribute("category", frameInfo.categoryData.abbrev || "");
     targetNode.setAttribute("tooltiptext", this.frame.location || "");
 
     let isRoot = frameInfo.nodeType == "Thread";
     if (isRoot) {
       functionCell.querySelector(".call-tree-zoom").hidden = true;
       functionCell.querySelector(".call-tree-category").hidden = true;
     }
 
     targetNode.appendChild(durationCell);
+    targetNode.appendChild(selfDurationCell);
     targetNode.appendChild(percentageCell);
+    targetNode.appendChild(selfPercentageCell);
     targetNode.appendChild(samplesCell);
     targetNode.appendChild(functionCell);
 
     return targetNode;
   },
 
   /**
+   * Calculate what percentage of all samples the given number of samples is.
+   */
+  _getPercentage: function (samples) {
+    return samples / this.root.frame.samples * 100;
+  },
+
+  /**
+   * Return an array of this frame's child calls.
+   */
+  _getChildCalls: function () {
+    return Object.keys(this.frame.calls).map(k => this.frame.calls[k]);
+  },
+
+  /**
    * Populates this node in the call tree with the corresponding "callees".
    * These are defined in the `frame` data source for this call view.
    * @param array:AbstractTreeItem children
    */
   _populateSelf: function(children) {
     let newLevel = this.level + 1;
 
-    for (let [, newFrame] of _Iterator(this.frame.calls)) {
+    for (let newFrame of this._getChildCalls()) {
       children.push(new CallView({
         caller: this,
         frame: newFrame,
         level: newLevel
       }));
     }
 
     // Sort the "callees" asc. by duration, before inserting them in the tree.
     children.sort((a, b) => a.frame.duration < b.frame.duration ? 1 : -1);
   },
 
   /**
    * Functions creating each cell in this call view.
    * Invoked by `_displaySelf`.
    */
-  _createTimeCell: function(duration) {
+  _createTimeCell: function(duration, isSelf = false) {
     let cell = this.document.createElement("label");
     cell.className = "plain call-tree-cell";
-    cell.setAttribute("type", "duration");
+    cell.setAttribute("type", isSelf ? "self-duration" : "duration");
     cell.setAttribute("crop", "end");
     cell.setAttribute("value", L10N.numberWithDecimals(duration, 2));
     return cell;
   },
-  _createExecutionCell: function(percentage) {
+  _createExecutionCell: function(percentage, isSelf = false) {
     let cell = this.document.createElement("label");
     cell.className = "plain call-tree-cell";
-    cell.setAttribute("type", "percentage");
+    cell.setAttribute("type", isSelf ? "self-percentage" : "percentage");
     cell.setAttribute("crop", "end");
     cell.setAttribute("value", L10N.numberWithDecimals(percentage, 2) + "%");
     return cell;
   },
   _createSamplesCell: function(count) {
     let cell = this.document.createElement("label");
     cell.className = "plain call-tree-cell";
     cell.setAttribute("type", "samples");
--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -747,27 +747,30 @@ let UI = {
     document.querySelector("#cmd_importHostedApp").removeAttribute("disabled");
     document.querySelector("#cmd_showProjectPanel").removeAttribute("disabled");
     document.querySelector("#cmd_showRuntimePanel").removeAttribute("disabled");
 
     // Action commands
     let playCmd = document.querySelector("#cmd_play");
     let stopCmd = document.querySelector("#cmd_stop");
     let debugCmd = document.querySelector("#cmd_toggleToolbox");
+    let playButton = document.querySelector('#action-button-play');
 
     if (!AppManager.selectedProject || AppManager.connection.status != Connection.Status.CONNECTED) {
       playCmd.setAttribute("disabled", "true");
       stopCmd.setAttribute("disabled", "true");
       debugCmd.setAttribute("disabled", "true");
     } else {
       let isProjectRunning = AppManager.isProjectRunning();
       if (isProjectRunning) {
+        playButton.classList.add("reload");
         stopCmd.removeAttribute("disabled");
         debugCmd.removeAttribute("disabled");
       } else {
+        playButton.classList.remove("reload");
         stopCmd.setAttribute("disabled", "true");
         debugCmd.setAttribute("disabled", "true");
       }
 
       // If connected and a project is selected
       if (AppManager.selectedProject.type == "runtimeApp") {
         playCmd.removeAttribute("disabled");
       } else if (AppManager.selectedProject.type == "tab") {
index 3ef9c16d899d40a732606bf2bf745480922c4e0c..d09c7b5deece58f3f7ad90135b6da8d07b8e267c
GIT binary patch
literal 29618
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
B#vK3v
--- a/browser/devtools/webide/themes/webide.css
+++ b/browser/devtools/webide/themes/webide.css
@@ -49,23 +49,23 @@ window.busy-determined #action-busy-unde
   -moz-appearance: none;
   -moz-box-align: center;
   border-width: 0;
   background: none;
 }
 
 .panel-button-anchor {
   list-style-image: url('icons.png');
-  -moz-image-region: rect(0px,391px,16px,364px);
+  -moz-image-region: rect(0px,491px,16px,464px);
   width: 12px;
   height: 7px;
 }
 
 .panel-button:hover > .panel-button-anchor {
-  -moz-image-region: rect(0px,445px,16px,418px);
+  -moz-image-region: rect(0px,545px,16px,518px);
 }
 
 /* Panel buttons - projects */
 
 #project-panel-button {
   -moz-box-pack: start;
   max-width: calc(50vw - 100px);
 }
@@ -78,34 +78,34 @@ window.busy-determined #action-busy-unde
 #project-panel-button > .panel-button-image[src] {
   /* with app icon */
   width: 20px;
   height: 20px;
 }
 
 #project-panel-button.no-project > .panel-button-image {
   list-style-image: url("icons.png");
-  -moz-image-region: rect(260px,338px,286px,312px);
+  -moz-image-region: rect(260px,438px,286px,412px);
 }
 
 #project-panel-button > .panel-button-label {
   -moz-box-flex: 1;
 }
 
 /* Panel buttons - runtime */
 
 #runtime-panel-button > .panel-button-image {
   list-style-image: url('icons.png');
-  -moz-image-region: rect(78px,338px,104px,312px);
+  -moz-image-region: rect(78px,438px,104px,412px);
   width: 13px;
   height: 13px;
 }
 
 #runtime-panel-button[active="true"] > .panel-button-image {
-  -moz-image-region: rect(78px,364px,104px,338px);
+  -moz-image-region: rect(78px,464px,104px,438px);
 }
 
 /* Action buttons */
 
 .action-button {
   -moz-appearance: none;
   border-width: 0;
   margin: 0;
@@ -129,16 +129,19 @@ window.busy-determined #action-busy-unde
 #action-button-play  { -moz-image-region: rect(0,100px,100px,0) }
 #action-button-stop  { -moz-image-region: rect(0,200px,100px,100px) }
 #action-button-debug { -moz-image-region: rect(0,300px,100px,200px) }
 
 #action-button-play:not([disabled="true"]):hover  { -moz-image-region: rect(200px,100px,300px,0) }
 #action-button-stop:not([disabled="true"]):hover  { -moz-image-region: rect(200px,200px,300px,100px) }
 #action-button-debug:not([disabled="true"]):not([active="true"]):hover { -moz-image-region: rect(200px,300px,300px,200px) }
 
+#action-button-play.reload { -moz-image-region: rect(0,400px,100px,303px) }
+#action-button-play.reload:hover { -moz-image-region: rect(200px,400px,300px,303px) }
+
 #action-button-debug[active="true"] { -moz-image-region: rect(100px,300px,200px,200px) }
 
 /* Panels */
 
 panel > vbox {
   overflow-x: hidden;
 }
 
@@ -191,19 +194,19 @@ panel > .panel-arrowcontainer > .panel-a
 /* project panel */
 
 .project-panel-item-newapp,
 .project-panel-item-openpackaged,
 .project-panel-item-openhosted {
   list-style-image: url("icons.png");
 }
 
-.project-panel-item-newapp       { -moz-image-region: rect(234px,338px,260px,312px) }
-.project-panel-item-openpackaged { -moz-image-region: rect(260px,338px,286px,312px) }
-.project-panel-item-openhosted   { -moz-image-region: rect(208px,338px,234px,312px) }
+.project-panel-item-newapp       { -moz-image-region: rect(234px,438px,260px,412px) }
+.project-panel-item-openpackaged { -moz-image-region: rect(260px,438px,286px,412px) }
+.project-panel-item-openhosted   { -moz-image-region: rect(208px,438px,234px,412px) }
 
 /* runtime panel */
 
 #runtime-panel .panel-arrowcontent {
   padding: 12px 0 0;
 }
 
 #runtime-panel-custom {
@@ -219,27 +222,27 @@ panel > .panel-arrowcontainer > .panel-a
 #runtime-panel-installsimulator,
 .runtime-panel-item-usb,
 .runtime-panel-item-wifi,
 .runtime-panel-item-custom,
 .runtime-panel-item-simulator {
   list-style-image: url("icons.png");
 }
 
-#runtime-details                { -moz-image-region: rect(156px,338px,182px,312px) }
-#runtime-screenshot             { -moz-image-region: rect(130px,338px,156px,312px) }
-#runtime-permissions            { -moz-image-region: rect(104px,338px,130px,312px) }
-#runtime-disconnect             { -moz-image-region: rect(52px,338px,78px,312px) }
-#runtime-panel-nousbdevice      { -moz-image-region: rect(156px,338px,182px,312px) }
-#runtime-panel-noadbhelper      { -moz-image-region: rect(234px,338px,260px,312px) }
-#runtime-panel-installsimulator { -moz-image-region: rect(0px,338px,26px,312px) }
-.runtime-panel-item-usb         { -moz-image-region: rect(52px,338px,78px,312px) }
-.runtime-panel-item-wifi        { -moz-image-region: rect(208px,338px,234px,312px) }
-.runtime-panel-item-custom      { -moz-image-region: rect(26px,338px,52px,312px) }
-.runtime-panel-item-simulator   { -moz-image-region: rect(0px,338px,26px,312px) }
+#runtime-details                { -moz-image-region: rect(156px,438px,182px,412px) }
+#runtime-screenshot             { -moz-image-region: rect(130px,438px,156px,412px) }
+#runtime-permissions            { -moz-image-region: rect(104px,438px,130px,412px) }
+#runtime-disconnect             { -moz-image-region: rect(52px,438px,78px,412px) }
+#runtime-panel-nousbdevice      { -moz-image-region: rect(156px,438px,182px,412px) }
+#runtime-panel-noadbhelper      { -moz-image-region: rect(234px,438px,260px,412px) }
+#runtime-panel-installsimulator { -moz-image-region: rect(0px,438px,26px,412px) }
+.runtime-panel-item-usb         { -moz-image-region: rect(52px,438px,78px,412px) }
+.runtime-panel-item-wifi        { -moz-image-region: rect(208px,438px,234px,412px) }
+.runtime-panel-item-custom      { -moz-image-region: rect(26px,438px,52px,412px) }
+.runtime-panel-item-simulator   { -moz-image-region: rect(0px,438px,26px,412px) }
 
 #runtime-actions {
   border-top: 1px solid rgba(221,221,221,1);
 }
 
 
 #runtime-actions > toolbarbutton {
   border-top: 1px solid rgba(221,221,221,1);
--- a/browser/locales/en-US/chrome/browser/devtools/app-manager.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/app-manager.properties
@@ -1,12 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+index.deprecationNotice=The App Manager will be removed in a future release.  Your projects have been migrated to WebIDE.
+index.launchWebIDE=Launch WebIDE
+index.readMoreAboutWebIDE=Read More
 # LOCALIZATION NOTE (device.deviceSize): %1$S is the device's width, %2$S is
 # the device's height, %3$S is the device's pixel density.
 # Example: 800x480 (86 DPI).
 device.deviceSize=Device size: %1$Sx%2$S (%3$S DPI)
 # LOCALIZATION NOTE (connection.connectedToDevice, connection.connectTo):
 # %1$S is the host name, %2$S is the port number.
 connection.connectedToDevice=Connected to %1$S
 connection.connectTo=Connect to %1$S:%2$S
--- a/browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd
@@ -226,16 +226,29 @@
   -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
 <!ENTITY netmonitorUI.summary.editAndResend "Edit and Resend">
 
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.summary.editAndResend.accesskey "R">
 
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders): This is the label displayed
+  -  on the button in the headers tab that toggle view for raw request/response headers
+     from the currently displayed request -->
+<!ENTITY netmonitorUI.summary.rawHeaders "Raw headers">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.requestHeaders): This is the label displayed
+  -  in the network details headers tab identifying the raw request headers textarea -->
+<!ENTITY netmonitorUI.summary.rawHeaders.requestHeaders "Request headers:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.responseHeaders): This is the label displayed
+  -  in the network details headers tab identifying the raw response headers textarea -->
+<!ENTITY netmonitorUI.summary.rawHeaders.responseHeaders "Response headers:">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container  -->
 <!ENTITY netmonitorUI.context.newTab      "Open in New Tab">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container -->
--- a/browser/locales/en-US/chrome/browser/devtools/profiler.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/profiler.dtd
@@ -34,16 +34,18 @@
 <!ENTITY profilerUI.importButton "Import…">
 
 <!-- LOCALIZATION NOTE (profilerUI.clearButton): This string is displayed
   -  on a button that remvoes all the recordings. -->
 <!ENTITY profilerUI.clearButton "Clear">
 
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
-<!ENTITY profilerUI.table.duration    "Time (ms)">
-<!ENTITY profilerUI.table.percentage  "Cost">
-<!ENTITY profilerUI.table.samples     "Samples">
-<!ENTITY profilerUI.table.function    "Function">
+<!ENTITY profilerUI.table.totalDuration   "Total Time (ms)">
+<!ENTITY profilerUI.table.selfDuration    "Self Time (ms)">
+<!ENTITY profilerUI.table.totalPercentage "Total Cost">
+<!ENTITY profilerUI.table.selfPercentage  "Self Cost">
+<!ENTITY profilerUI.table.samples         "Samples">
+<!ENTITY profilerUI.table.function        "Function">
 
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
 <!ENTITY profilerUI.newtab.tooltiptext "Add new tab from selection">
--- a/browser/modules/Social.jsm
+++ b/browser/modules/Social.jsm
@@ -266,18 +266,17 @@ function CreateSocialStatusWidget(aId, a
   CustomizableUI.createWidget({
     id: aId,
     type: 'custom',
     removable: true,
     defaultArea: CustomizableUI.AREA_NAVBAR,
     onBuild: function(aDocument) {
       let node = aDocument.createElement('toolbarbutton');
       node.id = this.id;
-      node.setAttribute('class', 'toolbarbutton-1 chromeclass-toolbar-additional social-status-button');
-      node.setAttribute('type', "badged");
+      node.setAttribute('class', 'toolbarbutton-1 chromeclass-toolbar-additional social-status-button badged-button');
       node.style.listStyleImage = "url(" + (aProvider.icon32URL || aProvider.iconURL) + ")";
       node.setAttribute("origin", aProvider.origin);
       node.setAttribute("label", aProvider.name);
       node.setAttribute("tooltiptext", aProvider.name);
       node.setAttribute("oncommand", "SocialStatus.showPopup(this);");
 
       if (PrivateBrowsingUtils.isWindowPrivate(aDocument.defaultView))
         node.setAttribute("disabled", "true");
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -560,17 +560,17 @@ menuitem:not([type]):not(.menuitem-toolt
 }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-container > .toolbarbutton-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px;
 }
 
-toolbarbutton[type="badged"] > .toolbarbutton-badge-container > .toolbarbutton-icon,
+toolbarbutton.badged-button > .toolbarbutton-badge-container > .toolbarbutton-icon,
 toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   max-width: 32px !important;
 }
 
 /* Help SDK icons fit: */
 toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   width: 16px;
 }
@@ -2072,45 +2072,16 @@ toolbarbutton.chevron > .toolbarbutton-i
   -moz-image-region: rect(0, 16px, 16px, 0);
   list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 
 #social-provider-button > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-.toolbarbutton-badge-container {
-  margin: 5px 3px;
-  position: relative;
-}
-
-toolbar[iconsize="small"] .toolbarbutton-badge-container {
-  margin: 0;
-}
-
-.toolbarbutton-badge[badge]:not([badge=""])::after {
-  /* The |content| property is set in the content stylesheet. */
-  font-size: 9px;
-  font-weight: bold;
-  padding: 0 1px;
-  color: #fff;
-  background-color: rgb(240,61,37);
-  border: 1px solid rgb(216,55,34);
-  border-radius: 2px;
-  box-shadow: 0 1px 0 rgba(0,39,121,0.77);
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 2px;
-  right: auto;
-}
-
 .popup-notification-icon[popupid="servicesInstall"] {
   list-style-image: url(chrome://browser/skin/social/services-64.png);
 }
 #servicesInstall-notification-icon {
   list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 #social-undoactivation-button {
   -moz-margin-start: 0; /* override default label margin to match description margin */
--- a/browser/themes/linux/devtools/netmonitor.css
+++ b/browser/themes/linux/devtools/netmonitor.css
@@ -3,16 +3,20 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %include ../../shared/devtools/netmonitor.inc.css
 
 #headers-summary-resend {
   padding: 4px;
 }
 
+#toggle-raw-headers {
+  padding: 4px;
+}
+
 .requests-menu-status-and-method {
   width: 9em;
 }
 
 .requests-menu-domain {
   width: 16vw;
 }
 
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -4414,58 +4414,16 @@ menulist.translate-infobar-element > .me
     width: 16px;
   }
 }
 
 #social-provider-button > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-.toolbarbutton-badge-container {
-  margin: 0;
-  padding: 0;
-  position: relative;
-}
-
-.toolbarbutton-badge[badge]:not([badge=""]) {
-  /* The |content| property is set in the content stylesheet. */
-  font-size: 9px;
-  font-weight: bold;
-  padding: 0 1px;
-  color: #fff;
-  background-color: rgb(240,61,37);
-  border: 1px solid rgb(216,55,34);
-  border-radius: 2px;
-  box-shadow: 0 1px 0 rgba(0,39,121,0.77);
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 1;
-}
-
-.toolbarbutton-badge[badge]:not([badge=""]):-moz-window-inactive {
-  background-color: rgb(230,230,230);
-  box-shadow: none;
-  border: 1px solid rgb(206,206,206);
-  color: rgb(192,192,192);
-}
-
-.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl) {
-  left: 0;
-  right: auto;
-}
-
-toolbar[mode="icons"] > *|* > .toolbarbutton-badge[badge]:not([badge=""]) {
-  right: -2px;
-}
-
-toolbar[mode="icons"] > *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl) {
-  left: -2px;
-}
-
 .popup-notification-icon[popupid="servicesInstall"] {
   list-style-image: url(chrome://browser/skin/social/services-64.png);
 }
 #servicesInstall-notification-icon {
   list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 
 @media (min-resolution: 2dppx) {
--- a/browser/themes/shared/devtools/netmonitor.inc.css
+++ b/browser/themes/shared/devtools/netmonitor.inc.css
@@ -480,16 +480,25 @@ label.requests-menu-status-code {
   padding-top: 2px;
 }
 
 #headers-summary-resend {
   margin-top: -10px;
   -moz-margin-end: 6px;
 }
 
+#toggle-raw-headers {
+  margin-top: -10px;
+  -moz-margin-end: 6px;
+}
+
+.raw-response-textarea {
+  height: 50vh;
+}
+
 /* Response tabpanel */
 
 #response-content-info-header {
   margin: 0;
   padding: 3px 8px;
 }
 
 .theme-dark  #response-content-info-header {
--- a/browser/themes/shared/devtools/profiler.inc.css
+++ b/browser/themes/shared/devtools/profiler.inc.css
@@ -246,23 +246,27 @@
   overflow: auto;
 }
 
 .call-tree-cells-container[categories-hidden] .call-tree-category {
   display: none;
 }
 
 .call-tree-header[type="duration"],
-.call-tree-cell[type="duration"] {
-  width: 7em;
+.call-tree-cell[type="duration"],
+.call-tree-header[type="self-duration"],
+.call-tree-cell[type="self-duration"] {
+  width: 9em;
 }
 
 .call-tree-header[type="percentage"],
-.call-tree-cell[type="percentage"] {
-  width: 5em;
+.call-tree-cell[type="percentage"],
+.call-tree-header[type="self-percentage"],
+.call-tree-cell[type="self-percentage"] {
+  width: 6em;
 }
 
 .call-tree-header[type="samples"],
 .call-tree-cell[type="samples"] {
   width: 5em;
 }
 
 .call-tree-header[type="function"],
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2694,69 +2694,16 @@ toolbar[brighttext] #switch-to-metro-but
   list-style-image: url(chrome://browser/skin/Metro_Glyph-inverted.png);
 }
 
 #switch-to-metro-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #switch-to-metro-button {
   list-style-image: url(chrome://browser/skin/Metro_Glyph-menuPanel.png);
 }
 
-.toolbarbutton-badge-container {
-  margin: 0;
-  padding: 0;
-  position: relative;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
-  padding: 2px 5px;
-}
-
-.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
-  position: absolute;
-  top: 2px;
-  right: 2px;
-}
-
-.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
-  -moz-margin-end: 0;
-}
-
-.toolbarbutton-badge[badge=""] {
-  display: none;
-}
-.toolbarbutton-badge[badge]:not([badge=""])::after {
-  /* The |content| property is set in the content stylesheet. */
-  font-size: 9px;
-  font-weight: bold;
-  padding: 0 1px;
-  color: #fff;
-  background-color: rgb(240,61,37);
-  border: 1px solid rgb(216,55,34);
-  border-radius: 2px;
-  box-shadow: 0 1px 0 rgba(0,39,121,0.77);
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-#nav-bar .toolbarbutton-badge[badge]:not([badge=""])::after {
-  top: 1px;
-  right: 1px;
-}
-
-.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 0;
-  right: auto;
-}
-
-#nav-bar .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 1px;
-  right: auto;
-}
-
 .popup-notification-icon[popupid="servicesInstall"] {
   list-style-image: url(chrome://browser/skin/social/services-64.png);
 }
 #servicesInstall-notification-icon {
   list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 #social-undoactivation-button {
   -moz-margin-start: 0; /* override default label margin to match description margin */
--- a/configure.in
+++ b/configure.in
@@ -3847,16 +3847,17 @@ MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_ANDROID_BEAM=
 MOZ_LOCALE_SWITCHER=
 MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
+MOZ_ANDROID_NEW_TABLET_UI=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_PAY=
 MOZ_AUDIO_CHANNEL_MANAGER=
 NSS_NO_LIBPKIX=
 MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
@@ -4907,16 +4908,24 @@ fi
 dnl ========================================================
 dnl = Include share overlay on Android
 dnl ========================================================
 if test -n "$MOZ_ANDROID_SHARE_OVERLAY"; then
     AC_DEFINE(MOZ_ANDROID_SHARE_OVERLAY)
 fi
 
 dnl ========================================================
+dnl = Include New Tablet UI on Android
+dnl = Temporary build flag to allow development in Nightly
+dnl ========================================================
+if test -n "$MOZ_ANDROID_NEW_TABLET_UI"; then
+    AC_DEFINE(MOZ_ANDROID_NEW_TABLET_UI)
+fi
+
+dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
 MOZ_IPDL_TESTS=
 
 MOZ_ARG_ENABLE_BOOL(ipdl-tests,
 [  --enable-ipdl-tests     Enable expensive IPDL tests],
     MOZ_IPDL_TESTS=1,
     MOZ_IPDL_TESTS=)
@@ -8515,16 +8524,17 @@ AC_SUBST(MOZ_METRO)
 
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
 AC_SUBST(MOZ_LOCALE_SWITCHER)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
+AC_SUBST(MOZ_ANDROID_NEW_TABLET_UI)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
 AC_SUBST(USE_ELF_HACK)
 AC_SUBST(INCREMENTAL_LINKER)
 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
--- a/mobile/android/base/favicons/Favicons.java
+++ b/mobile/android/base/favicons/Favicons.java
@@ -404,17 +404,17 @@ public class Favicons {
                 isNewTabletEnabled ? R.drawable.new_tablet_default_favicon : R.drawable.favicon;
         defaultFavicon = BitmapFactory.decodeResource(res, defaultFaviconDrawableID);
         if (defaultFavicon == null) {
             throw new IllegalStateException("Null default favicon was returned from the resources system!");
         }
 
         // TODO: Remove this branch when old tablet is removed.
         final int defaultFaviconSizeDimenID =
-                isNewTabletEnabled ? R.dimen.tab_strip_favicon_size : R.dimen.favicon_bg;
+                isNewTabletEnabled ? R.dimen.new_tablet_tab_strip_favicon_size : R.dimen.favicon_bg;
         defaultFaviconSize = res.getDimensionPixelSize(defaultFaviconSizeDimenID);
 
         // Screen-density-adjusted upper limit on favicon size. Favicons larger than this are
         // downscaled to this size or discarded.
         largestFaviconSize = context.getResources().getDimensionPixelSize(R.dimen.favicon_largest_interesting_size);
         faviconsCache = new FaviconCache(FAVICON_CACHE_SIZE_BYTES, largestFaviconSize);
 
         // Initialize page mappings for each of our special pages.
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -395,20 +395,16 @@ gbjar.sources += [
     'tabs/RemoteTabsSetupPanel.java',
     'tabs/RemoteTabsVerificationPanel.java',
     'tabs/TabCurve.java',
     'tabs/TabsGridLayout.java',
     'tabs/TabsLayoutAdapter.java',
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
-    'tabs/TabStrip.java',
-    'tabs/TabStripAdapter.java',
-    'tabs/TabStripItemView.java',
-    'tabs/TabStripView.java',
     'TabsAccessor.java',
     'Telemetry.java',
     'TelemetryContract.java',
     'TextSelection.java',
     'TextSelectionHandle.java',
     'ThumbnailHelper.java',
     'toolbar/AutocompleteHandler.java',
     'toolbar/BackButton.java',
@@ -508,16 +504,30 @@ if CONFIG['MOZ_ANDROID_SHARE_OVERLAY']:
         'overlays/ui/OverlayDialogButton.java',
         'overlays/ui/OverlayToastHelper.java',
         'overlays/ui/SendTabDeviceListArrayAdapter.java',
         'overlays/ui/SendTabList.java',
         'overlays/ui/SendTabTargetSelectedListener.java',
         'overlays/ui/ShareDialog.java',
     ]
 
+if (CONFIG['MOZ_ANDROID_MAX_SDK_VERSION']):
+    max_sdk_version = int(CONFIG['MOZ_ANDROID_MAX_SDK_VERSION'])
+else:
+    max_sdk_version = 999
+
+if CONFIG['MOZ_ANDROID_NEW_TABLET_UI'] and max_sdk_version >= 11:
+    gbjar.sources += [
+        'tabs/TabStrip.java',
+        'tabs/TabStripAdapter.java',
+        'tabs/TabStripItemView.java',
+        'tabs/TabStripView.java'
+    ]
+    ANDROID_RES_DIRS += [ SRCDIR + '/newtablet/res' ]
+
 gbjar.sources += sync_java_files
 gbjar.generated_sources += sync_generated_java_files
 gbjar.extra_jars = [
     'gecko-R.jar',
     'gecko-mozglue.jar',
     'gecko-thirdparty.jar',
     'gecko-util.jar',
     'sync-thirdparty.jar',
@@ -614,17 +624,18 @@ ANDROID_RES_DIRS += [
 
 ANDROID_GENERATED_RESFILES += [
     'res/raw/suggestedsites.json',
     'res/values/strings.xml',
 ]
 
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
-            'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION'):
+            'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
+            'MOZ_ANDROID_NEW_TABLET_UI'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
 for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
 for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH', 'CPU_ARCH',
rename from mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
rename to mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_strip_item_title.xml
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_default_favicon.png
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_menu.png
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count.png
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_default_favicon.png
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_menu.png
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count.png
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
rename from mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_divider.xml
rename to mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_divider.xml
rename from mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
rename to mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_menu.png
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_menu.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png
rename from mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml
rename from mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tab_strip.xml
rename from mobile/android/base/resources/layout-large-v11/new_tablet_tabs_counter.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tabs_counter.xml
rename from mobile/android/base/resources/layout-large-v11/tab_strip.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml
rename from mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item.xml
rename from mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
+++ b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml
@@ -3,17 +3,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
    <ImageView
         android:id="@+id/favicon"
-        android:layout_width="@dimen/tab_strip_favicon_size"
+        android:layout_width="@dimen/new_tablet_tab_strip_favicon_size"
         android:layout_height="match_parent"
         android:layout_marginRight="9dp"
         android:scaleType="centerInside"
         android:duplicateParentState="true"/>
 
     <org.mozilla.gecko.widget.FadedTextView
         android:id="@+id/title"
         android:layout_width="0dip"
rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
rename to mobile/android/base/resources/drawable-hdpi/ic_menu_back.png
rename from mobile/android/base/resources/drawable-mdpi-v11/ic_menu_back.png
rename to mobile/android/base/resources/drawable-mdpi/ic_menu_back.png
rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png
copy from mobile/android/base/resources/values/layout.xml
copy to mobile/android/base/resources/drawable/new_tablet_default_favicon.xml
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
-</resources>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
copy from mobile/android/base/resources/values/layout.xml
copy to mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
-</resources>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
copy from mobile/android/base/resources/values/layout.xml
copy to mobile/android/base/resources/drawable/new_tablet_ic_menu_reload.xml
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/drawable/new_tablet_ic_menu_reload.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
-</resources>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
copy from mobile/android/base/resources/values/layout.xml
copy to mobile/android/base/resources/drawable/new_tablet_tabs_count.xml
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/drawable/new_tablet_tabs_count.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
-</resources>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
deleted file mode 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <ImageButton android:id="@+id/add_tab"
-                 android:layout_width="@dimen/browser_toolbar_height"
-                 android:layout_height="@dimen/browser_toolbar_height"
-                 android:padding="14dip"
-                 android:src="@drawable/tab_new_level"
-                 android:contentDescription="@string/new_tab"
-                 android:background="@drawable/action_bar_button_inverse"/>
-
-    <View android:layout_width="0dip"
-          android:layout_height="match_parent"
-          android:layout_weight="1.0"/>
-
-    <ImageButton android:id="@+id/menu"
-                 style="@style/UrlBar.ImageButton"
-                 android:padding="@dimen/browser_toolbar_button_padding"
-                 android:src="@drawable/menu_tabs"
-                 android:contentDescription="@string/menu"
-                 android:background="@drawable/action_bar_button_inverse"
-                 android:visibility="gone"/>
-
-</merge>
deleted file mode 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="match_parent"
-                                            android:tabStripEnabled="false"
-                                            android:divider="@drawable/tab_indicator_divider"
-                                            android:layout="@layout/tabs_panel_indicator"/>
-
-</merge>
rename from mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
rename to mobile/android/base/resources/layout-large-land-v11/tabs_panel_sidebar.xml
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_sidebar.xml
@@ -10,17 +10,24 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/background_tabs">
 
-            <include layout="@layout/tabs_panel_header"/>
+
+            <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
+                                                    android:layout_width="wrap_content"
+                                                    android:layout_height="match_parent"
+                                                    android:tabStripEnabled="false"
+                                                    android:divider="@drawable/tab_indicator_divider"
+                                                    android:layout="@layout/tabs_panel_indicator"/>
+
 
         </view>
 
         <View android:layout_width="match_parent"
               android:layout_height="2dp"
               android:layout_alignParentBottom="true"
               android:background="#1A000000"/>
 
@@ -59,17 +66,35 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/background_tabs">
 
-            <include layout="@layout/tabs_panel_footer"/>
+            <ImageButton android:id="@+id/add_tab"
+                         android:layout_width="@dimen/browser_toolbar_height"
+                         android:layout_height="@dimen/browser_toolbar_height"
+                         android:padding="14dip"
+                         android:src="@drawable/tab_new_level"
+                         android:contentDescription="@string/new_tab"
+                         android:background="@drawable/action_bar_button_inverse"/>
+
+            <View android:layout_width="0dip"
+                  android:layout_height="match_parent"
+                  android:layout_weight="1.0"/>
+
+            <ImageButton android:id="@+id/menu"
+                         style="@style/UrlBar.ImageButton"
+                         android:padding="@dimen/browser_toolbar_button_padding"
+                         android:src="@drawable/menu_tabs"
+                         android:contentDescription="@string/menu"
+                         android:background="@drawable/action_bar_button_inverse"
+                         android:visibility="gone"/>
 
         </view>
 
         <View android:layout_width="match_parent"
               android:layout_height="2dp"
               android:layout_alignParentTop="true"
               android:background="#1A000000"/>
 
rename from mobile/android/base/resources/layout/tabs_panel.xml
rename to mobile/android/base/resources/layout/tabs_panel_default.xml
--- a/mobile/android/base/resources/layout/tabs_panel.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_default.xml
@@ -10,17 +10,41 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/background_tabs">
 
-            <include layout="@layout/tabs_panel_header"/>
+            <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
+                                                    android:layout_width="wrap_content"
+                                                    android:layout_height="match_parent"
+                                                    android:tabStripEnabled="false"
+                                                    android:divider="@drawable/tab_indicator_divider"
+                                                    android:layout="@layout/tabs_panel_indicator"/>
+
+            <View android:layout_width="0dip"
+                  android:layout_height="match_parent"
+                  android:layout_weight="1.0"/>
+
+            <ImageButton android:id="@+id/add_tab"
+                         style="@style/UrlBar.ImageButton"
+                         android:padding="@dimen/browser_toolbar_button_padding"
+                         android:src="@drawable/tab_new_level"
+                         android:contentDescription="@string/new_tab"
+                         android:background="@drawable/action_bar_button_inverse"/>
+
+            <ImageButton android:id="@+id/menu"
+                         style="@style/UrlBar.ImageButton"
+                         android:padding="@dimen/browser_toolbar_button_padding"
+                         android:src="@drawable/menu_tabs"
+                         android:contentDescription="@string/menu"
+                         android:background="@drawable/action_bar_button_inverse"
+                         android:visibility="gone"/>
 
         </view>
 
         <View android:layout_width="match_parent"
               android:layout_height="2dp"
               android:layout_alignParentBottom="true"
               android:background="#1A000000"/>
 
deleted file mode 100644
--- a/mobile/android/base/resources/layout/tabs_panel_header.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="match_parent"
-                                            android:tabStripEnabled="false"
-                                            android:divider="@drawable/tab_indicator_divider"
-                                            android:layout="@layout/tabs_panel_indicator"/>
-
-    <View android:layout_width="0dip"
-          android:layout_height="match_parent"
-          android:layout_weight="1.0"/>
-
-    <ImageButton android:id="@+id/add_tab"
-                 style="@style/UrlBar.ImageButton"
-                 android:padding="@dimen/browser_toolbar_button_padding"
-                 android:src="@drawable/tab_new_level"
-                 android:contentDescription="@string/new_tab"
-                 android:background="@drawable/action_bar_button_inverse"/>
-
-    <ImageButton android:id="@+id/menu"
-                 style="@style/UrlBar.ImageButton"
-                 android:padding="@dimen/browser_toolbar_button_padding"
-                 android:src="@drawable/menu_tabs"
-                 android:contentDescription="@string/menu"
-                 android:background="@drawable/action_bar_button_inverse"
-                 android:visibility="gone"/>
-
-</merge>
copy from mobile/android/base/resources/values/layout.xml
copy to mobile/android/base/resources/values-large-land-v11/layout.xml
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/values-large-land-v11/layout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
+    <item type="layout" name="tabs_panel">@layout/tabs_panel_sidebar</item>
 </resources>
--- a/mobile/android/base/resources/values-large-v11/dimens.xml
+++ b/mobile/android/base/resources/values-large-v11/dimens.xml
@@ -7,19 +7,12 @@
 
     <dimen name="browser_toolbar_height">56dp</dimen>
     <dimen name="browser_toolbar_button_padding">16dp</dimen>
 
     <!-- If you update one of these values, update the other. -->
     <dimen name="back_button_width">42dp</dimen>
     <dimen name="back_button_width_half">21dp</dimen>
 
-    <dimen name="forward_default_offset">-13dip</dimen>
-    <dimen name="new_tablet_forward_default_offset">-6dp</dimen>
-
-    <dimen name="new_tablet_browser_toolbar_menu_item_padding">19dp</dimen>
-
     <dimen name="tabs_counter_size">26sp</dimen>
     <dimen name="panel_grid_view_column_width">200dp</dimen>
 
-    <dimen name="tab_strip_favicon_size">16dp</dimen>
-
 </resources>
--- a/mobile/android/base/resources/values-large-v11/themes.xml
+++ b/mobile/android/base/resources/values-large-v11/themes.xml
@@ -9,13 +9,14 @@
         Base application theme. This could be overridden by GeckoBaseTheme
         in other res/values-XXX/themes.xml.
     -->
     <style name="GeckoBase" parent="@android:style/Theme.Holo.Light">
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="arrowPopupWidth">400dp</item>
+        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
     </style>
 
     <style name="GeckoStartPane" parent="Gecko.Dialog"/>
     
 </resources>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -15,16 +15,20 @@
     <!-- favicon_size includes 4dp of right padding. We can't use margin (which would allow us to
          specify the actual size) because that would decrease the size of our hit target. -->
     <dimen name="browser_toolbar_favicon_size">21.33dip</dimen>
     <dimen name="browser_toolbar_shadow_size">2dp</dimen>
 
     <dimen name="new_tablet_tab_strip_height">48dp</dimen>
     <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
     <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
+    <dimen name="new_tablet_tab_strip_favicon_size">-30dp</dimen>
+    <dimen name="new_tablet_forward_default_offset">-6dp</dimen>
+    <dimen name="new_tablet_browser_toolbar_menu_item_padding">19dp</dimen>
+    <dimen name="forward_default_offset">-13dip</dimen>
 
     <!-- Dimensions used by Favicons and FaviconView -->
     <dimen name="favicon_size_small">16dp</dimen>
     <dimen name="favicon_size_large">32dp</dimen>
     <dimen name="favicon_bg">32dp</dimen>
     <dimen name="favicon_bg_radius">1dp</dimen>
     <!-- Set the upper limit on the size of favicon that will be processed. Favicons larger than
          this will be downscaled to this value. If you need to use larger Favicons (Due to a UI
--- a/mobile/android/base/resources/values/ids.xml
+++ b/mobile/android/base/resources/values/ids.xml
@@ -2,10 +2,11 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
 
     <item type="id" name="guestNotification"/>
     <item type="id" name="original_height"/>
+    <item type="id" name="menu_items"/>
 
 </resources>
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/values/layout.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
+    <item type="layout" name="tabs_panel">@layout/tabs_panel_default</item>
     <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
+    <item type="layout" name="new_tablet_browser_toolbar">@null</item>
+    <item type="layout" name="new_tablet_tab_strip">@null</item>
 </resources>
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -88,17 +88,16 @@
         <item name="android:spinnerStyle">@style/Widget.Spinner</item>
         <item name="android:windowBackground">@android:color/white</item>
         <item name="bookmarksListViewStyle">@style/Widget.BookmarksListView</item>
         <item name="floatingHintEditTextStyle">@style/FloatingHintEditText</item>
         <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
         <item name="geckoMenuListViewStyle">@style/Widget.GeckoMenuListView</item>
         <item name="homeListViewStyle">@style/Widget.HomeListView</item>
         <item name="menuItemActionBarStyle">@style/Widget.MenuItemActionBar</item>
-        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
         <item name="menuItemActionModeStyle">@style/GeckoActionBar.Button</item>
         <item name="menuItemShareActionButtonStyle">@style/Widget.MenuItemSecondaryActionBar</item>
         <item name="panelGridViewStyle">@style/Widget.PanelGridView</item>
         <item name="topSitesGridItemViewStyle">@style/Widget.TopSitesGridItemView</item>
         <item name="topSitesGridViewStyle">@style/Widget.TopSitesGridView</item>
         <item name="topSitesThumbnailViewStyle">@style/Widget.TopSitesThumbnailView</item>
     </style>
 
--- a/mobile/android/base/tabs/TabStripItemView.java
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -64,17 +64,17 @@ public class TabStripItemView extends Th
         tabClipRegion = new Region();
 
         tabPaint = new Paint();
         tabPaint.setAntiAlias(true);
         tabPaint.setColor(0xFFFF0000);
         tabPaint.setStrokeWidth(0.0f);
         tabPaint.setXfermode(new PorterDuffXfermode(Mode.DST_IN));
 
-        faviconSize = getResources().getDimensionPixelSize(R.dimen.tab_strip_favicon_size);
+        faviconSize = getResources().getDimensionPixelSize(R.dimen.new_tablet_tab_strip_favicon_size);
 
         LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
         setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (id < 0) {
                     throw new IllegalStateException("Invalid tab id:" + id);
                 }
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -114,17 +114,17 @@ public class TabsPanel extends LinearLay
         setOrientation(LinearLayout.VERTICAL);
 
         mCurrentPanel = Panel.NORMAL_TABS;
 
         mPopupMenu = new GeckoPopupMenu(context);
         mPopupMenu.inflate(R.menu.tabs_menu);
         mPopupMenu.setOnMenuItemClickListener(this);
 
-        LayoutInflater.from(context).inflate(R.layout.tabs_panel, this);
+        inflateLayout(context);
         initialize();
 
         mAppStateListener = new AppStateListener() {
             @Override
             public void onResume() {
                 if (mPanel == mPanelRemote) {
                     // Refresh the remote panel.
                     mPanelRemote.show();
@@ -136,16 +136,25 @@ public class TabsPanel extends LinearLay
                 // Remote panel is already refreshed by chrome refresh.
             }
 
             @Override
             public void onPause() {}
         };
     }
 
+
+    private void inflateLayout(Context context) {
+        if (NewTabletUI.isEnabled(context)) {
+            LayoutInflater.from(context).inflate(R.layout.tabs_panel_default, this);
+        } else {
+            LayoutInflater.from(context).inflate(R.layout.tabs_panel, this);
+        }
+    }
+
     private void initialize() {
         mHeader = (RelativeLayout) findViewById(R.id.tabs_panel_header);
         mPanelsContainer = (PanelViewContainer) findViewById(R.id.tabs_container);
 
         mPanelNormal = (PanelView) findViewById(R.id.normal_tabs);
         mPanelNormal.setTabsPanel(this);
 
         mPanelPrivate = (PanelView) findViewById(R.id.private_tabs_panel);
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -76,16 +76,22 @@ MOZ_WEBGL_CONFORMANT=1
 
 # Enable the Search Activity in nightly.
 if test "$NIGHTLY_BUILD"; then
   MOZ_ANDROID_SEARCH_ACTIVITY=1
 else
   MOZ_ANDROID_SEARCH_ACTIVITY=
 fi
 
+# Enable the new tablet UI in pre-release builds
+# if the max Android sdk is undefined or at least 11.
+if test ! "$RELEASE_BUILD"; then
+  MOZ_ANDROID_NEW_TABLET_UI=1
+fi
+
 # Enable the share handler in pre-release builds.
 if test ! "$RELEASE_BUILD"; then
   MOZ_ANDROID_SHARE_OVERLAY=1
 fi
 
 # Enable the Mozilla Location Service stumbler in Nightly.
 if test "$NIGHTLY_BUILD"; then
   MOZ_ANDROID_MLS_STUMBLER=1
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -590,17 +590,18 @@ nsIOService::NewChannelFromURIWithProxyF
     if (NS_FAILED(rv))
         return rv;
 
     nsCOMPtr<nsIProxiedProtocolHandler> pph = do_QueryInterface(handler);
     if (pph)
         rv = pph->NewProxiedChannel(aURI, nullptr, aProxyFlags, aProxyURI, result);
     else
         rv = handler->NewChannel(aURI, result);
-    NS_ENSURE_SUCCESS(rv, rv);
+    if (NS_FAILED(rv))
+        return rv;
 
     // Some extensions override the http protocol handler and provide their own
     // implementation. The channels returned from that implementation doesn't
     // seem to always implement the nsIUploadChannel2 interface, presumably
     // because it's a new interface.
     // Eventually we should remove this and simply require that http channels
     // implement the new interface.
     // See bug 529041
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -478,17 +478,19 @@ EngineManager.prototype = {
   getAll: function () {
     return [engine for ([name, engine] in Iterator(this._engines))];
   },
 
   /**
    * N.B., does not pay attention to the declined list.
    */
   getEnabled: function () {
-    return this.getAll().filter(function(engine) engine.enabled);
+    return this.getAll()
+               .filter((engine) => engine.enabled)
+               .sort((a, b) => a.syncPriority - b.syncPriority);
   },
 
   get enabledEngineNames() {
     return [e.name for each (e in this.getEnabled())];
   },
 
   persistDeclined: function () {
     Svc.Prefs.set("declinedEngines", [...this._declined].join(","));
@@ -695,16 +697,23 @@ SyncEngine.kRecoveryStrategy = {
   error:  "error"
 };
 
 SyncEngine.prototype = {
   __proto__: Engine.prototype,
   _recordObj: CryptoWrapper,
   version: 1,
 
+  // A relative priority to use when computing an order
+  // for engines to be synced. Higher-priority engines
+  // (lower numbers) are synced first.
+  // It is recommended that a unique value be used for each engine,
+  // in order to guarantee a stable sequence.
+  syncPriority: 0,
+
   // How many records to pull in a single sync. This is primarily to avoid very
   // long first syncs against profiles with many history records.
   downloadLimit: null,
 
   // How many records to pull at one time when specifying IDs. This is to avoid
   // URI length limitations.
   guidFetchBatchSize: DEFAULT_GUID_FETCH_BATCH_SIZE,
   mobileGUIDFetchBatchSize: DEFAULT_MOBILE_GUID_FETCH_BATCH_SIZE,
--- a/services/sync/modules/engines/addons.js
+++ b/services/sync/modules/engines/addons.js
@@ -114,16 +114,18 @@ this.AddonsEngine = function AddonsEngin
 }
 AddonsEngine.prototype = {
   __proto__:              SyncEngine.prototype,
   _storeObj:              AddonsStore,
   _trackerObj:            AddonsTracker,
   _recordObj:             AddonRecord,
   version:                1,
 
+  syncPriority:           5,
+
   _reconciler:            null,
 
   /**
    * Override parent method to find add-ons by their public ID, not Sync GUID.
    */
   _findDupe: function _findDupe(item) {
     let id = item.addonID;
 
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@@ -198,16 +198,18 @@ this.BookmarksEngine = function Bookmark
 }
 BookmarksEngine.prototype = {
   __proto__: SyncEngine.prototype,
   _recordObj: PlacesItem,
   _storeObj: BookmarksStore,
   _trackerObj: BookmarksTracker,
   version: 2,
 
+  syncPriority: 4,
+
   _sync: function _sync() {
     let engine = this;
     let batchEx = null;
 
     // Try running sync in batch mode
     PlacesUtils.bookmarks.runInBatchMode({
       runBatched: function wrappedSync() {
         try {
--- a/services/sync/modules/engines/forms.js
+++ b/services/sync/modules/engines/forms.js
@@ -102,16 +102,18 @@ this.FormEngine = function FormEngine(se
 }
 FormEngine.prototype = {
   __proto__: SyncEngine.prototype,
   _storeObj: FormStore,
   _trackerObj: FormTracker,
   _recordObj: FormRec,
   applyIncomingBatchSize: FORMS_STORE_BATCH_SIZE,
 
+  syncPriority: 6,
+
   get prefName() "history",
 
   _findDupe: function _findDupe(item) {
     return FormWrapper.getGUID(item.name, item.value);
   }
 };
 
 function FormStore(name, engine) {
--- a/services/sync/modules/engines/history.js
+++ b/services/sync/modules/engines/history.js
@@ -36,17 +36,19 @@ this.HistoryEngine = function HistoryEng
   SyncEngine.call(this, "History", service);
 }
 HistoryEngine.prototype = {
   __proto__: SyncEngine.prototype,
   _recordObj: HistoryRec,
   _storeObj: HistoryStore,
   _trackerObj: HistoryTracker,
   downloadLimit: MAX_HISTORY_DOWNLOAD,
-  applyIncomingBatchSize: HISTORY_STORE_BATCH_SIZE
+  applyIncomingBatchSize: HISTORY_STORE_BATCH_SIZE,
+
+  syncPriority: 7,
 };
 
 function HistoryStore(name, engine) {
   Store.call(this, name, engine);
 
   // Explicitly nullify our references to our cached services so we don't leak
   Svc.Obs.add("places-shutdown", function() {
     for each ([query, stmt] in Iterator(this._stmts)) {
--- a/services/sync/modules/engines/passwords.js
+++ b/services/sync/modules/engines/passwords.js
@@ -31,16 +31,18 @@ this.PasswordEngine = function PasswordE
 }
 PasswordEngine.prototype = {
   __proto__: SyncEngine.prototype,
   _storeObj: PasswordStore,
   _trackerObj: PasswordTracker,
   _recordObj: LoginRec,
   applyIncomingBatchSize: PASSWORDS_STORE_BATCH_SIZE,
 
+  syncPriority: 2,
+
   _syncFinish: function _syncFinish() {
     SyncEngine.prototype._syncFinish.call(this);
 
     // Delete the weave credentials from the server once
     if (!Svc.Prefs.get("deletePwdFxA", false)) {
       try {
         let ids = [];
         for (let host of Utils.getSyncCredentialsHosts()) {
--- a/services/sync/modules/engines/prefs.js
+++ b/services/sync/modules/engines/prefs.js
@@ -36,16 +36,18 @@ this.PrefsEngine = function PrefsEngine(
 }
 PrefsEngine.prototype = {
   __proto__: SyncEngine.prototype,
   _storeObj: PrefStore,
   _trackerObj: PrefTracker,
   _recordObj: PrefRec,
   version: 2,
 
+  syncPriority: 1,
+
   getChangedIDs: function getChangedIDs() {
     // No need for a proper timestamp (no conflict resolution needed).
     let changedIDs = {};
     if (this._tracker.modified)
       changedIDs[PREFS_GUID] = 0;
     return changedIDs;
   },
 
--- a/services/sync/modules/engines/tabs.js
+++ b/services/sync/modules/engines/tabs.js
@@ -40,16 +40,18 @@ this.TabEngine = function TabEngine(serv
   this._resetClient();
 }
 TabEngine.prototype = {
   __proto__: SyncEngine.prototype,
   _storeObj: TabStore,
   _trackerObj: TabTracker,
   _recordObj: TabSetRecord,
 
+  syncPriority: 3,
+
   getChangedIDs: function getChangedIDs() {
     // No need for a proper timestamp (no conflict resolution needed).
     let changedIDs = {};
     if (this._tracker.modified)
       changedIDs[this.service.clientsEngine.localID] = 0;
     return changedIDs;
   },
 
--- a/services/sync/tests/unit/head_helpers.js
+++ b/services/sync/tests/unit/head_helpers.js
@@ -187,8 +187,16 @@ function mockGetWindowEnumerator(url, nu
     hasMoreElements: function () {
       return elements.length;
     },
     getNext: function () {
       return elements.shift();
     },
   };
 }
+
+// Helper that allows checking array equality.
+function do_check_array_eq(a1, a2) {
+  do_check_eq(a1.length, a2.length);
+  for (let i = 0; i < a1.length; ++i) {
+    do_check_eq(a1[i], a2[i]);
+  }
+}
--- a/services/sync/tests/unit/test_enginemanager.js
+++ b/services/sync/tests/unit/test_enginemanager.js
@@ -70,16 +70,33 @@ add_test(function test_basics() {
   do_check_eq(engines.length, 1);
   do_check_eq(engines[0], petrol);
 
   dummy.enabled = true;
   diesel.enabled = true;
   engines = manager.getEnabled();
   do_check_eq(engines.length, 3);
 
+  _("getEnabled() returns enabled engines in sorted order");
+  petrol.syncPriority = 1;
+  dummy.syncPriority = 2;
+  diesel.syncPriority = 3;
+
+  engines = manager.getEnabled();
+
+  do_check_array_eq(engines, [petrol, dummy, diesel]);
+
+  _("Changing the priorities should change the order in getEnabled()");
+
+  dummy.syncPriority = 4;
+
+  engines = manager.getEnabled();
+
+  do_check_array_eq(engines, [petrol, diesel, dummy]);
+
   _("Unregister an engine by name");
   manager.unregister('dummy');
   do_check_eq(manager.get('dummy'), undefined);
   engines = manager.getAll();
   do_check_eq(engines.length, 2);
   do_check_eq(engines.indexOf(dummy), -1);
 
   _("Unregister an engine by value");
--- a/services/sync/tests/unit/test_keys.js
+++ b/services/sync/tests/unit/test_keys.js
@@ -9,23 +9,16 @@ Cu.import("resource://services-sync/util
 
 let collectionKeys = new CollectionKeyManager();
 
 function sha256HMAC(message, key) {
   let h = Utils.makeHMACHasher(Ci.nsICryptoHMAC.SHA256, key);
   return Utils.digestBytes(message, h);
 }
 
-function do_check_array_eq(a1, a2) {
-  do_check_eq(a1.length, a2.length);
-  for (let i = 0; i < a1.length; ++i) {
-    do_check_eq(a1[i], a2[i]);
-  }
-}
-
 function do_check_keypair_eq(a, b) {
   do_check_eq(2, a.length);
   do_check_eq(2, b.length);
   do_check_eq(a[0], b[0]);
   do_check_eq(a[1], b[1]);
 }
 
 function test_time_keyFromString(iterations) {
--- a/toolkit/content/widgets/toolbarbutton.xml
+++ b/toolkit/content/widgets/toolbarbutton.xml
@@ -9,41 +9,41 @@
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="toolbarbutton" display="xul:button" role="xul:toolbarbutton"
            extends="chrome://global/content/bindings/button.xml#button-base">
     <resources>
       <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
     </resources>
-    
+
     <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label,consumeanchor"/>
       <xul:label class="toolbarbutton-text" crop="right" flex="1"
                  xbl:inherits="value=label,accesskey,crop,wrap"/>
       <xul:label class="toolbarbutton-multiline-text" flex="1"
                  xbl:inherits="xbl:text=label,accesskey,wrap"/>
     </content>
   </binding>
 
-  <binding id="menu" display="xul:menu" 
+  <binding id="menu" display="xul:menu"
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
     <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label,type,consumeanchor"/>
       <xul:label class="toolbarbutton-text" crop="right" flex="1"
                  xbl:inherits="value=label,accesskey,crop,dragover-top,wrap"/>
       <xul:label class="toolbarbutton-multiline-text" flex="1"
                  xbl:inherits="xbl:text=label,accesskey,wrap"/>
       <xul:dropmarker anonid="dropmarker" type="menu"
                       class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label"/>
     </content>
   </binding>
-  
+
   <binding id="menu-vertical" display="xul:menu"
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
     <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:hbox flex="1" align="center">
         <xul:vbox flex="1" align="center">
           <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label,consumeanchor"/>
           <xul:label class="toolbarbutton-text" crop="right" flex="1"
@@ -51,18 +51,18 @@
           <xul:label class="toolbarbutton-multiline-text" flex="1"
                      xbl:inherits="xbl:text=label,accesskey,wrap"/>
         </xul:vbox>
         <xul:dropmarker anonid="dropmarker" type="menu"
                         class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label"/>
       </xul:hbox>
     </content>
   </binding>
-  
-  <binding id="menu-button" display="xul:menu" 
+
+  <binding id="menu-button" display="xul:menu"
            extends="chrome://global/content/bindings/button.xml#menu-button-base">
     <resources>
       <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
     </resources>
 
     <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
@@ -75,9 +75,24 @@
   </binding>
 
   <binding id="toolbarbutton-image"
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
     <content>
       <xul:image class="toolbarbutton-icon" xbl:inherits="src=image"/>
     </content>
   </binding>
+
+  <binding id="toolbarbutton-badged"
+           extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
+    <content>
+      <children includes="observes|template|menupopup|panel|tooltip"/>
+      <xul:hbox class="toolbarbutton-badge-container" align="start" pack="end">
+        <xul:hbox class="toolbarbutton-badge" xbl:inherits="badge"/>
+        <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
+      </xul:hbox>
+      <xul:label class="toolbarbutton-text" crop="right" flex="1"
+                 xbl:inherits="value=label,accesskey,crop,wrap"/>
+      <xul:label class="toolbarbutton-multiline-text" flex="1"
+                 xbl:inherits="xbl:text=label,accesskey,wrap"/>
+    </content>
+  </binding>
 </bindings>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -133,16 +133,24 @@ toolbarbutton[type="menu"],
 toolbarbutton[type="panel"] {
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu");
 }
 
 toolbarbutton[type="menu-button"] {
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
 }
 
+toolbarbutton.badged-button {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-badged");
+}
+
+toolbarbutton.badged-button .toolbarbutton-badge[badge]:not([badge=""])::after {
+  content: attr(badge);
+}
+
 toolbar[mode="icons"] .toolbarbutton-text,
 toolbar[mode="icons"] .toolbarbutton-multiline-text,
 toolbar[mode="text"] .toolbarbutton-icon {
   display: none;
 }
 
 .toolbarbutton-multiline-text:not([wrap="true"]),
 .toolbarbutton-text[wrap="true"] {
new file mode 100644
--- /dev/null
+++ b/toolkit/devtools/server/docs/protocol.js.md
@@ -0,0 +1,546 @@
+Writing an Actor
+================
+
+A Simple Hello World
+--------------------
+
+Here's a simple Hello World actor.  It is a global actor (not associated with a given browser tab).
+
+    let protocol = require("devtools/server/protocol");
+    let {method, Arg, Option, RetVal} = protocol;
+
+    // This will be called by the framework when you call DebuggerServer.
+    // registerModule(), and adds the actor as a 'helloActor' property
+    // on the root actor.
+    exports.register = function(handle) {
+        handle.addGlobalActor(HelloActor, "helloActor");
+    }
+
+    // This will be called by the framework during shutdown/unload.
+    exports.unregister = function(handle) {
+        handle.removeGlobalActor(HelloActor); // This is optional, all registered actors will be removed automatically
+    }
+
+    // Create the hello actor.  This uses addon-sdk's heritage module
+    // behind the scenes in case you want to understand the class stuff
+    // a bit better.
+
+    let HelloActor = protocol.ActorClass({
+        typeName: "helloWorld", // I'll explain types later, I promise.
+        initialize: function(conn) {
+            protocol.Actor.prototype.initialize.call(this, conn); // This is the worst part of heritage.
+        },
+
+        sayHello: method(function() {
+           return "hello";
+        }, {
+          // The request packet template.  There are no arguments, so
+          // it is empty.  The framework will add the "type" and "to"
+          // request properties.
+          request: {},
+
+          // The response packet template.  The return value of the function
+          // will be plugged in where the RetVal() appears in the template.
+          response: {
+            greeting: RetVal("string") // "string" is the return value type.
+          }
+        }
+    });
+
+This actor now supports a `sayHello` request.  A request/reply will look like this:
+
+    -> { to: <actorID>, type: "sayHello" }
+    <- { from: <actorID>, greeting: "hello" }
+
+Now we can create a client side object.  We call these *front* objects.
+
+Here's the front for the HelloActor:
+
+    let HelloFront = protocol.FrontClass(HelloActor, {
+      initialize: function(client, form) {
+        protocol.Front.prototype.initialize.call(this, client, form);
+      }
+    });
+
+Note that there is no `sayHello` method.  The FrontClass will generate a method on the Front object that matches the method declaration in the Actor class.
+
+The generated methods will return a Promise.  That promise will resolve to the RetVal of the actor method.
+
+So if we have a reference to a HelloFront object, we can issue a `sayHello` request:
+
+  hello.sayHello().then(greeting => {
+    console.log(greeting);
+  });
+
+How do you get an initial reference to the front?  That's a bit tricky, but basically there are two ways:
+
+* Manually
+* Magically
+
+Manually - If you're using a DebuggerClient instance, you can discover the actorID manually and create a Front for it:
+  let hello = HelloFront(this.client, { actorID: <hello actorID> });
+
+Magically - Once you have an initial reference to a protocol.js object, it can return other protocol.js objects and fronts will automatically be created.
+
+Arguments
+---------
+
+`sayHello` has no arguments, so let's add a method that does take arguments:
+
+    echo: method(function(str) {
+        return str + "... " + str + "...";
+    }, {
+      request: { echo: Arg(0, "string") },
+      response: { echoed: RetVal("string") }
+    })
+
+This tells the library to place the 0th argument, which should be a string, in the `echo` property of the request packet.
+
+
+This will generate a request handler whose request and response packets look like this:
+
+    { to: <actorID>, type: "echo", echo: <str> }
+    { from: <actorID>, echoed: <str> }
+
+The client usage should be predictable:
+
+    echo.echo("hello").then(str => { assert(str === "hello... hello...") })
+
+The library tries hard to make using fronts feel like natural javascript (or as natural as you believe promises are, I guess).  When building the response it will put the return value of the function where RetVal() is specified in the response template, and on the client side it will use the value in that position when resolving the promise.
+
+Returning JSON
+--------------
+
+Maybe your response is an object:
+
+    addOneTwice: method(function(a, b) {
+        return { a: a + 1, b: b + 1 };
+    }, {
+        request: { a: Arg(0, "number"), b: Arg(1, "number") },
+        response: { ret: RetVal("json") }
+    });
+
+This will generate a response packet that looks like:
+
+    { from: <actorID>, ret: { a: <number>, b: <number> } }
+
+That's probably unnecessary nesting (if you're sure you won't be returning an object with 'from' as a key!), so you can just replace `response` with:
+
+    response: RetVal("json")
+
+and now your packet will look like:
+
+    { from: <actorID>, a: <number>, b: <number> }
+
+Types and Marshalling
+---------------------
+
+Things have been pretty simple up to this point - all the arguments we've passed in have been javascript primitives.  But for some types (most importantly Actor types, which I'll get to eventually), we can't just copy them into a JSON packet and expect it to work, we need to marshal things ourselves.
+
+Again, the protocol lib tries hard to provide a natural API to actors and clients, and sometime that natural API might involve object APIs. I'm going to use a wickedly contrived example, bear with me.  Let's say I have a small object that contains a number and has a few methods associated with it:
+
+    let Incrementor = function(i) {
+      this.value = value;
+    }
+    Incrementor.prototype = {
+        increment: function() { this.value++ },
+        decrement: function() { this.value-- }
+    };
+
+
+and I want to return it from a backend function:
+
+    getIncrementor: method(function(i) {
+        return new Incrementor(i)
+    }, {
+        request: { number: Arg(0, "number") },
+        response: { value: RetVal("incrementor") } // We'll define "incrementor" below.
+    });
+
+I want that response to look like `{ from: <actorID>, value: <number> }`, but the client side needs to know to return an Incrementor, not a primitive number.  So let's tell the protocol lib about Incrementors:
+
+    protocol.types.addType("incrementor", {
+        // When writing to a protocol packet, just send the value
+        write: (v) => v.value,
+
+        // When reading from a protocol packet, wrap with an Incrementor
+        // object.
+        read: (v) => new Incrementor(v)
+    });
+
+And now our client can use the API as expected:
+
+    front.getIncrementor(5).then(incrementor => {
+        incrementor.increment();
+        assert(incrementor.value === 6);
+    });
+
+You can do the same thing with arguments:
+
+    passIncrementor: method(function(inc) {
+        w.increment();
+        assert(incrementor.value === 6);
+    }, {
+        request: { Arg(0, "incrementor") },
+    });
+
+    front.passIncrementor(new Incrementor(5));
+
+The library provides primitiive `boolean`, `number`, `string`, and `json` types.
+
+Moving right along, let's say you want to pass/return an array of Incrementors.  You can just prepend `array:` to the type name:
+
+    incrementAll: method(function(incrementors) {
+        incrementors.forEach(incrementor => {
+          incrementor.increment();
+        }
+        return incrementors;
+    }, {
+        request: { incrementors: Arg(0, "array:incrementor") },
+        response: { incrementors: RetVal("array:incrementor") }
+    })
+
+Or maybe you want to return a dictionary where one item is a incrementor.  To do this you need to tell the type system which members of the dictionary need custom marshallers:
+
+    protocol.types.addDictType("contrivedObject", {
+        incrementor: "incrementor",
+        incrementorArray: "array:incrementor"
+    });
+
+    reallyContrivedExample: method(function() {
+        return {
+            /* a and b are primitives and so don't need to be called out specifically in addDictType */
+            a: "hello", b: "world",
+            incrementor: new Incrementor(1), incrementorArray: [new Incrementor(2), new Incrementor(3)]
+        }
+    }, {
+        response: RetVal("contrivedObject")
+    });
+
+    front.reallyContrivedExample().then(obj => {
+        assert(obj.a == "hello");
+        assert(obj.b == "world");
+        assert(incrementor.i == 1);
+        assert(incrementorArray[0].i == 2);
+        assert(incrementorArray[1].i == 3);
+    });
+
+Nullables
+---------
+
+If an argument, return value, or dict property can be null/undefined, you can prepend `nullable:` to the type name:
+
+    "nullable:incrementor",  // Can be null/undefined or an incrementor
+    "array:nullable:incrementor", // An array of incrementors that can have holes.
+    "nullable:array:incrementor" // Either null/undefined or an array of incrementors without holes.
+
+
+Actors
+------
+
+Probably the most common objects that need custom martialing are actors themselves.  These are more interesting than the Incrementor object, but by default they're somewhat easy to work with.  Let's add a ChildActor implementation that will be returned by the HelloActor (which is rapidly becoming the OverwhelminglyComplexActor):
+
+    let ChildActor = protocol.ActorClass({
+        actorType: "childActor",
+        initialize: function(conn, id) {
+            protocol.Actor.prototype.initialize.call(this, conn);
+            this.greeting = "hello from " + id;
+        },
+        getGreeting: method(function() {
+            return this.greeting;
+        }, {
+            response: { greeting: RetVal("string") },
+        }
+    });
+
+    let ChildFront = protocol.FrontClass(ChildActor, {
+        initialize: function(client, form) {
+            protocol.Front.prototype.initialize.call(this, client, form);
+        },
+    });
+
+The library will register a marshaller for the actor type itself, using typeName as its tag.
+
+So we can now add the following code to HelloActor:
+
+    getChild: method(function(id) {
+        return ChildActor(this.conn, id);
+    }, {
+        request: { id: Arg(0, "string") },
+        response: { child: RetVal("childActor") }
+    });
+
+    front.getChild("child1").then(childFront => {
+        return childFront.getGreeting();
+    }).then(greeting => {
+        assert(id === "hello from child1");
+    });
+
+The conversation will look like this:
+
+    { to: <actorID>, type: "getChild", id: "child1" }
+    { from: <actorID>, child: { actor: <childActorID> }}
+    { to: <childActorID>, type: "getGreeting" }
+    { from: <childActorID>, greeting: "hello from child1" }
+
+But the ID is the only interesting part of this made-up example.  You're never going to want a reference to a ChildActor without checking its ID.  Making an extra request just to get that id is wasteful.  You really want the first response to look like `{ from: <actorID>, child: { actor: <childActorID>, greeting: "hello from child1" } }`
+
+You can customize the marshalling of an actor by providing a `form` method in the `ChildActor` class:
+
+    form: function() {
+        return {
+            actor: this.actorID,
+            greeting: this.greeting
+        }
+    },
+
+And you can demarshal in the `ChildFront` class by implementing a matching `form` method:
+
+    form: function(form) {
+        this.actorID = form.actor;
+        this.greeting = form.greeting;
+    }
+
+Now you can use the id immediately:
+
+    front.getChild("child1").then(child => { assert(child.greeting === "child1) });
+
+You may come across a situation where you want to customize the output of a `form` method depending on the operation being performed.  For example, imagine that ChildActor is a bit more complex, with a, b, c, and d members:
+
+    ChildActor:
+        form: function() {
+            return {
+                actor: this.actorID,
+                greeting: this.greeting,
+                a: this.a,
+                b: this.b,
+                c: this.c,
+                d: this.d
+            }
+        }
+    ChildFront:
+        form: function(form) {
+            this.actorID = form.actorID;
+            this.id = form.id;
+            this.a = form.a;
+            this.b = form.b;
+            this.c = form.c;
+            this.d = form.d;
+        }
+
+And imagine you want to change 'c' and return the object:
+
+    // Oops!  If a type is going to return references to itself or any other
+    // type that isn't fully registered yet, you need to predeclare the type.
+    types.addActorType("childActor");
+
+    ...
+
+    changeC: method(function(newC) {
+        c = newC;
+        return this;
+    }, {
+        request: { newC: Arg(0) },
+        response: { self: RetVal("childActor") }
+    });
+
+    ...
+
+    childFront.changeC('hello').then(ret => { assert(ret === childFront); assert(childFront.c === "hello") });
+
+Now our response will look like:
+
+    { from: <childActorID>, self: { actor: <childActorID>, greeting: <id>, a: <a>, b: <b>, c: "hello", d: <d> }
+
+But that's wasteful.  Only c changed.  So we can provide a *detail* to the type using `#`:
+
+    response: { self: RetVal("childActor#changec") }
+
+and update our form methods to make use of that data:
+
+    ChildActor:
+    form: function(detail) {
+        if (detail === "changec") {
+            return { actor: this.actorID, c: this.c }
+        }
+        ... // the rest of the form method stays the same.
+    }
+
+    ChildFront:
+    form: function(form, detail) {
+        if (detail === "changec") {
+            this.actorID = form.actor;
+            this.c = form.c;
+            return;
+        }
+        ... // the rest of the form method stays the same.
+    }
+
+Now the packet looks like a much more reasonable `{ from: <childActorID>, self: { actor: <childActorID>, c: "hello" } }`
+
+Lifetimes
+---------
+
+No, I don't want to talk about lifetimes quite yet.
+
+Events
+------
+
+Your actor has great news!
+
+Actors are subclasses of jetpack `EventTarget`, so you can just emit:
+
+    let event = require("sdk/core/event");
+
+    giveGoodNews: method(function(news) {
+        event.emit(this, "good-news", news);
+    }, {
+        request: { news: Arg(0) }
+    });
+
+... but nobody will really care, because that's not going over the protocol.  But you can describe the packet in an `events` member, the same way you would specify a request:
+
+    events: {
+        "good-news": {
+            type: "goodNews", // event target naming and packet naming are at odds, and we want both to be natural!
+            news: Arg(0)
+        }
+    }
+
+And now you can listen to events on a front:
+
+    front.on("good-news", news => {
+        console.log("Got good news: " + news + "\n");
+    });
+    front.giveGoodNews().then(() => { console.log("request returned.") });
+
+You might want to update your front's state when an event is fired, before emitting it against the front.  You can use `preEvent` in the front definition for that:
+
+    countGoodNews: protocol.preEvent("good-news", function(news) {
+        this.amountOfGoodNews++;
+    });
+
+On a somewhat related note, not every method needs to be request/response.  Just like an actor can emit a one-way event, a method can be marked as a one-way request.  Maybe we don't care about giveGoodNews returning anything:
+
+    giveGoodNews: method(function(news) {
+        emit(this, "good-news", news);
+    }, {
+        request: { news: Arg(0, "string") },
+        oneway: true
+    });
+
+Lifetimes
+---------
+
+No, let's talk about custom front methods instead.
+
+Custom Front Methods
+--------------------
+
+You might have some bookkeeping to do before issuing a request.  Let's say you're calling `echo`, but you want to count the number of times you issue that request.  Just use the `custom` tag in your front implementation:
+
+    echo: custom(function(str) {
+        this.numEchos++;
+        return this._echo(str);
+    }, {
+        impl: "_echo"
+    })
+
+This puts the generated implementation in `_echo` instead of `echo`, letting you implement `echo` as needed.  If you leave out the `impl`, it just won't generate the implementation at all.  You're on your own.
+
+Lifetimes
+---------
+
+OK, I can't think of any more ways to put this off.  The remote debugging protocol has the concept of a *parent* for each actor.  This is to make distributed memory management a bit easier.  Basically, any descendents of an actor will be destroyed if the actor is destroyed.
+
+Other than that, the basic protocol makes no guarantees about lifetime.  Each interface defined in the protocol will need to discuss and document its approach to lifetime management (although there are a few common patterns).
+
+The protocol library will maintain the child/parent relationships for you, but it needs some help deciding what the child/parent relationships are.
+
+The default parent of an object is the first object that returns it after it is created.  So to revisit our earlier HelloActor `getChild` implementation:
+
+    getChild: method(function(id) {
+        return new ChildActor(this.conn, id);
+    }, {
+        request: { id: Arg(0) },
+        response: { child: RetVal("childActor") }
+    });
+
+The ChildActor's parent is the HelloActor, because it's the one that created it.
+
+You can customize this behavior in two ways.  The first is by defining a `marshallPool` property in your actor.  Imagine a new ChildActor method:
+
+    getSibling: method(function(id) {
+        return new ChildActor(this.conn, id);
+    }, {
+        request: { id: Arg(0) },
+        response: { child: RetVal("childActor") }
+    });
+
+This creates a new child actor owned by the current child actor.  But in this example we want all actors created by the child to be owned by the HelloActor.  So we can define a `defaultParent` property that makes use of the `parent` proeprty provided by the Actor class:
+
+    get marshallPool() { return this.parent }
+
+The front needs to provide a matching `defaultParent` property that returns an owning front, to make sure the client and server lifetimes stay synced.
+
+For more complex situations, you can define your own lifetime properties.  Take this new pair of HelloActor methods:
+
+    // When the "temp" lifetime is specified, look for the _temporaryParent attribute as the owner.
+    types.addLifetime("temp", "_temporaryParent");
+
+    getTemporaryChild: method(function(id) {
+        if (!this._temporaryParent) {
+            // Create an actor to serve as the parent for all temporary children and explicitly
+            // add it as a child of this actor.
+            this._temporaryParent = this.manage(new Actor(this.conn));
+        }
+        return new ChildActor(this.conn, id);
+    }, {
+        request: { id: Arg(0) },
+        response: {
+            child: RetVal("temp:childActor") // use the lifetime name here to specify the expected lifetime.
+        }
+    });
+
+    clearTemporaryChildren: method(function(id) {
+        if (this._temporaryParent) {
+            this._temporaryParent.destroy();
+            delete this._temporaryParent;
+        }
+    });
+
+This will require some matching work on the front:
+
+    getTemporaryChild: protocol.custom(function(id) {
+        if (!this._temporaryParent) {
+            this._temporaryParent = this.manage(new Front(this.client));
+        }
+        return this._getTemporaryChild(id);
+    }, {
+        impl: "_getTemporaryChild"
+    }),
+
+    clearTemporaryChildren: protocol.custom(function(id) {
+        if (this._temporaryParent) {
+            this._temporaryParent.destroy();
+            delete this._temporaryParent;
+        }
+        return this._clearTemporaryChildren();
+    }, {
+        impl: "_clearTemporaryChildren"
+    })
+
+Telemetry
+---------
+
+You can specify a telemetry probe id in your method spec:
+
+    echo: method(function(str) {
+        return str;
+    }, {
+        request: { str: Arg(0) },
+        response: { str: RetVal() },
+        telemetry: "ECHO"
+    });
+
+... and the time to execute that request will be included as a telemetry probe.
--- a/toolkit/themes/linux/global/toolbarbutton.css
+++ b/toolkit/themes/linux/global/toolbarbutton.css
@@ -100,16 +100,50 @@ toolbarbutton[type="menu-button"][disabl
 }
 
 .toolbarbutton-menubutton-button {
   -moz-box-align: center;
   -moz-box-pack: center;
   -moz-box-orient: vertical;
 }
 
+/* ::::: toolbarbutton badged ::::: */
+
+.toolbarbutton-badge {
+  background-color: #d90000;
+}
+
+.toolbarbutton-badge::after {
+  /* The |content| property is set in the content stylesheet. */
+  font-size: 10px;
+  font-weight: bold;
+  padding: 1px 2px 2px;
+  color: #fff;
+  background-color: inherit;
+  border-radius: 2px;
+  box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
+              0 -1px 0 hsla(0, 0%, 0%, .1) inset,
+              0 1px 0 hsla(206, 50%, 10%, .2);
+  position: absolute;
+  top: -4px;
+  right: -2px;
+  min-width: 10px;
+  line-height: 10px;
+  text-align: center;
+}
+
+.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
+  left: -2px;
+  right: auto;
+}
+
+.toolbarbutton-badge-container {
+  position: relative;
+}
+
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
   margin: 0 3px;
   -moz-appearance: toolbarbutton-dropdown !important;
   list-style-image: none;
   -moz-image-region: auto;
 }
--- a/toolkit/themes/osx/global/toolbarbutton.css
+++ b/toolkit/themes/osx/global/toolbarbutton.css
@@ -71,16 +71,65 @@ toolbarbutton[type="menu-button"][disabl
 
 .toolbarbutton-menubutton-button {
   -moz-box-align: center;
   -moz-box-pack: center;
   -moz-box-orient: vertical;
   text-shadow: inherit;
 }
 
+/* ::::: toolbarbutton badged ::::: */
+
+.toolbarbutton-badge {
+  background-color: #d90000;
+}
+
+.toolbarbutton-badge::after {
+  /* The |content| property is set in the content stylesheet. */
+  font-size: 9px;
+  padding: 1px 2px 2px;
+  color: #fff;
+  background-color: inherit;
+  border-radius: 2px;
+  box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
+              0 -1px 0 hsla(0, 0%, 0%, .1) inset,
+              0 1px 0 hsla(206, 50%, 10%, .2);
+  position: absolute;
+  top: -8px;
+  right: -8px;
+  z-index: 1;
+  min-width: 10px;
+  line-height: 10px;
+  text-align: center;
+}
+
+.toolbarbutton-badge:-moz-window-inactive::after {
+  background-color: rgb(230,230,230);
+  box-shadow: none;
+  border: 1px solid rgb(206,206,206);
+  color: rgb(192,192,192);
+}
+
+.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
+  left: -8px;
+  right: auto;
+}
+
+toolbar[mode="icons"] > *|* > .toolbarbutton-badge::after {
+  right: -10px;
+}
+
+toolbar[mode="icons"] > *|* > .toolbarbutton-badge:-moz-locale-dir(rtl)::after {
+  left: -10px;
+}
+
+.toolbarbutton-badge-container {
+  position: relative;
+}
+
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none;
   border: none;
   background-color: transparent !important;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
   width: auto;
--- a/toolkit/themes/windows/global/toolbarbutton.css
+++ b/toolkit/themes/windows/global/toolbarbutton.css
@@ -132,16 +132,58 @@ toolbarbutton[type="menu-button"][disabl
 }
 
 .toolbarbutton-menubutton-button {
   -moz-box-align: center;
   -moz-box-pack: center;
   -moz-box-orient: vertical;
 }
 
+/* ::::: toolbarbutton badged ::::: */
+
+.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
+}
+
+.toolbarbutton-badge[badge=""] {
+  display: none;
+}
+
+.toolbarbutton-badge {
+  background-color: #d90000;
+}
+
+.toolbarbutton-badge::after {
+  /* The |content| property is set in the content stylesheet. */
+  font-size: 10px;
+  font-weight: bold;
+  padding: 1px 2px 2px;
+  color: #fff;
+  background-color: inherit;
+  border-radius: 2px;
+  box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
+              0 -1px 0 hsla(0, 0%, 0%, .1) inset,
+              0 1px 0 hsla(206, 50%, 10%, .2);
+  position: absolute;
+  top: -4px;
+  right: -2px;
+  min-width: 10px;
+  line-height: 10px;
+  text-align: center;
+}
+
+.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
+  left: -2px;
+  right: auto;
+}
+
+.toolbarbutton-badge-container {
+  position: relative;
+}
+
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none;
   padding: 3px 7px;
   border: none;
   background-color: transparent;
   width: auto;