Backed out changeset d6be7dc56cc5 (bug 1370580) for failing test-oop-extensions/browser_ext_browserAction_popup_resize.js. r=backout

browser/components/customizableui/PanelMultiView.jsm

@@ -167,6 +167,9 @@ this.PanelMultiView = class {
   get _mainView() {
     return this._mainViewId ? this.document.getElementById(this._mainViewId) : null;
   }
+  get showingSubViewAsMainView() {
+    return this.node.getAttribute("mainViewIsSubView") == "true";
+  }
 
   get _transitioning() {
     return this.__transitioning;
@@ -468,6 +471,7 @@ this.PanelMultiView = class {
           custWidget.onViewShowing({ target: aAnchor, detail });
         }
       }
+      viewNode.setAttribute("current", true);
       if (this.panelViews && this._mainViewWidth)
         viewNode.style.maxWidth = viewNode.style.minWidth = this._mainViewWidth + "px";
 
@@ -490,7 +494,6 @@ this.PanelMultiView = class {
       }
 
       this._currentSubView = viewNode;
-      viewNode.setAttribute("current", true);
       if (this.panelViews) {
         this.node.setAttribute("viewtype", "subview");
         if (!playTransition)

browser/components/customizableui/content/panelUI.js

@@ -515,14 +515,12 @@ const PanelUI = {
       multiView.setAttribute("nosubviews", "true");
       multiView.setAttribute("viewCacheId", "appMenu-viewCache");
       if (gPhotonStructure) {
-        tempPanel.setAttribute("photon", true);
         multiView.setAttribute("mainViewId", viewNode.id);
         multiView.appendChild(viewNode);
       }
       tempPanel.appendChild(multiView);
-      if (!gPhotonStructure) {
-        multiView.setMainView(viewNode);
-      }
+      multiView.setAttribute("mainViewIsSubView", "true");
+      multiView.setMainView(viewNode);
       viewNode.classList.add("cui-widget-panelview");
 
       let viewShown = false;

browser/components/extensions/ext-browserAction.js

@@ -130,7 +130,6 @@ this.browserAction = class extends ExtensionAPI {
         let view = document.createElementNS(XUL_NS, "panelview");
         view.id = this.viewId;
         view.setAttribute("flex", "1");
-        view.setAttribute("extension", true);
 
         document.getElementById("PanelUI-multiView").appendChild(view);
         document.addEventListener("popupshowing", this);

browser/themes/shared/customizableui/panelUI.inc.css

@@ -261,8 +261,7 @@ photonpanelmultiview .panel-subview-header {
 }
 
 #appMenu-popup > .panel-arrowcontainer > .panel-arrowcontent,
-#PanelUI-popup > .panel-arrowcontainer > .panel-arrowcontent,
-panel[photon] > .panel-arrowcontainer > .panel-arrowcontent {
+#PanelUI-popup > .panel-arrowcontainer > .panel-arrowcontent {
   overflow: hidden;
 }
 
@@ -339,8 +338,7 @@ panelview:not([mainview]) .toolbarbutton-text,
 
 /* START photonpanelview adjustments */
 
-#appMenu-popup > .panel-arrowcontainer > .panel-arrowcontent,
-panel[photon] > .panel-arrowcontainer > .panel-arrowcontent {
+#appMenu-popup > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
   border-radius: 0;
 }
@@ -350,8 +348,7 @@ photonpanelmultiview panelview {
   padding: 6px 0;
 }
 
-#appMenu-popup panelview,
-#customizationui-widget-multiview panelview:not([extension]) {
+#appMenu-popup panelview {
   min-width: @menuPanelWidth@;
 }
 
@@ -2079,14 +2076,4 @@ photonpanelmultiview .PanelUI-subView toolbarseparator {
   margin-inline-end: 0;
 }
 
-photonpanelmultiview#customizationui-widget-multiview > .panel-viewcontainer {
-  overflow: hidden;
-}
-
-/* This is explicitly overriding the overflow properties set above. */
-photonpanelmultiview .cui-widget-panelview {
-  overflow-x: visible;
-  overflow-y: visible;
-}
-
 /* END photon adjustments */