[WIP, M141] Vertical tabs

patches/helium/ui/layout-constants.patch

@@ -1,15 +1,24 @@
 --- a/chrome/browser/ui/layout_constants.cc
 +++ b/chrome/browser/ui/layout_constants.cc
-@@ -29,7 +29,7 @@ int GetLayoutConstant(LayoutConstant con
+@@ -22,6 +22,8 @@
+ int GetLayoutConstant(LayoutConstant constant) {
+   const bool touch_ui = ui::TouchUiController::Get()->touch_ui();
+   switch (constant) {
++    case TOP_BAR_VERTICAL_PADDING:
++      return 3;
+     case APP_MENU_PROFILE_ROW_AVATAR_ICON_SIZE:
+       return 24;
+     case APP_MENU_MAXIMUM_CHARACTER_LENGTH:
+@@ -29,7 +31,7 @@ int GetLayoutConstant(LayoutConstant con
      case BOOKMARK_BAR_HEIGHT: {
        // The fixed margin ensures the bookmark buttons appear centered relative
        // to the white space above and below.
 -      const int bookmark_bar_attached_vertical_margin = 6;
-+      const int bookmark_bar_attached_vertical_margin = 3;
++      const int bookmark_bar_attached_vertical_margin = GetLayoutConstant(TOP_BAR_VERTICAL_PADDING);
        return GetLayoutConstant(BOOKMARK_BAR_BUTTON_HEIGHT) +
               bookmark_bar_attached_vertical_margin;
      }
-@@ -52,7 +52,7 @@ int GetLayoutConstant(LayoutConstant con
+@@ -52,7 +54,7 @@ int GetLayoutConstant(LayoutConstant con
      case LOCATION_BAR_CHILD_INTERIOR_PADDING:
        return 3;
      case LOCATION_BAR_CHILD_CORNER_RADIUS:
@@ -18,7 +27,7 @@
      case LOCATION_BAR_CHIP_ICON_SIZE:
        return 16;
      case LOCATION_BAR_CHIP_PADDING:
-@@ -60,7 +60,7 @@ int GetLayoutConstant(LayoutConstant con
+@@ -60,7 +62,7 @@ int GetLayoutConstant(LayoutConstant con
      case LOCATION_BAR_ELEMENT_PADDING:
        return touch_ui ? 3 : 2;
      case LOCATION_BAR_PAGE_INFO_ICON_VERTICAL_PADDING:
@@ -27,7 +36,7 @@
      case LOCATION_BAR_LEADING_DECORATION_EDGE_PADDING:
        // TODO(manukh): See comment in `LocationBarView::Layout()`. We have too
        //   many feature permutations that would affect this and other layout
-@@ -69,11 +69,11 @@ int GetLayoutConstant(LayoutConstant con
+@@ -69,11 +71,11 @@ int GetLayoutConstant(LayoutConstant con
        //   here once we decide on a permutation.
        NOTREACHED();
      case LOCATION_BAR_TRAILING_DECORATION_EDGE_PADDING:
@@ -41,7 +50,7 @@
      case LOCATION_BAR_ICON_SIZE:
        return touch_ui ? 20 : 16;
      case LOCATION_BAR_LEADING_ICON_SIZE:
-@@ -93,12 +93,12 @@ int GetLayoutConstant(LayoutConstant con
+@@ -93,12 +95,12 @@ int GetLayoutConstant(LayoutConstant con
      case TAB_CLOSE_BUTTON_SIZE:
        return touch_ui ? 24 : 16;
      case TAB_HEIGHT:
@@ -52,11 +61,11 @@
               GetLayoutConstant(TAB_STRIP_PADDING);
      case TAB_STRIP_PADDING:
 -      return 6;
-+      return 3;
++      return GetLayoutConstant(TOP_BAR_VERTICAL_PADDING);
      case TAB_SEPARATOR_HEIGHT:
        return touch_ui ? 24 : 20;
      case TAB_PRE_TITLE_PADDING:
-@@ -106,28 +106,23 @@ int GetLayoutConstant(LayoutConstant con
+@@ -106,28 +108,23 @@ int GetLayoutConstant(LayoutConstant con
      case TAB_STACK_DISTANCE:
        return touch_ui ? 4 : 6;
      case TABSTRIP_TOOLBAR_OVERLAP:
@@ -76,23 +85,23 @@
        return touch_ui ? 20 : 16;
      case TOOLBAR_DIVIDER_SPACING:
 -      return 9;
-+      return 6;
++      return GetLayoutConstant(TOP_BAR_VERTICAL_PADDING) * 2;
      case TOOLBAR_DIVIDER_WIDTH:
 -      return 2;
 +      return 1;
      case TOOLBAR_ELEMENT_PADDING:
 -      return touch_ui ? 0 : 4;
-+      return touch_ui ? 0 : 3;
++      return touch_ui ? 0 : GetLayoutConstant(TOP_BAR_VERTICAL_PADDING);
      case TOOLBAR_ICON_DEFAULT_MARGIN:
 -      return touch_ui ? 0 : 2;
-+      return touch_ui ? 0 : 3;
++      return touch_ui ? 0 : GetLayoutConstant(TOP_BAR_VERTICAL_PADDING);
      case TOOLBAR_STANDARD_SPACING:
 -      return touch_ui ? 12 : 9;
-+      return touch_ui ? 12 : 6;
++      return touch_ui ? 12 : GetLayoutConstant(TOP_BAR_VERTICAL_PADDING) * 2;
      case PAGE_INFO_ICON_SIZE:
        return 20;
      case DOWNLOAD_ICON_SIZE:
-@@ -167,7 +162,7 @@ gfx::Insets GetLayoutInsets(LayoutInset
+@@ -167,7 +164,7 @@ gfx::Insets GetLayoutInsets(LayoutInset
      }
 
      case TOOLBAR_BUTTON:
@@ -101,17 +110,33 @@
 
      case BROWSER_APP_MENU_CHIP_PADDING:
        if (touch_ui) {
-@@ -183,11 +178,11 @@ gfx::Insets GetLayoutInsets(LayoutInset
+@@ -183,11 +180,15 @@ gfx::Insets GetLayoutInsets(LayoutInset
        if (touch_ui) {
          return GetLayoutInsets(TOOLBAR_BUTTON);
        } else {
 -        return gfx::Insets::TLBR(7, 10, 7, 4);
 +        return gfx::Insets::TLBR(4, 5, 4, 4);
        }
 
-     case TOOLBAR_INTERIOR_MARGIN:
+-    case TOOLBAR_INTERIOR_MARGIN:
 -      return touch_ui ? gfx::Insets::VH(4, 0) : gfx::Insets::VH(6, 5);
-+      return touch_ui ? gfx::Insets() : gfx::Insets::TLBR(0, 6, 3, 6);
++    case TOOLBAR_INTERIOR_MARGIN: {
++      const int vert = GetLayoutConstant(TOP_BAR_VERTICAL_PADDING);
++      const int horiz = vert * 2;
++      return touch_ui ? gfx::Insets() :
++          gfx::Insets::TLBR(0, horiz, vert, horiz);
++    }
 
      case WEBUI_TAB_STRIP_TOOLBAR_INTERIOR_MARGIN:
        return gfx::Insets::VH(4, 0);
+--- a/chrome/browser/ui/layout_constants.h
++++ b/chrome/browser/ui/layout_constants.h
+@@ -10,6 +10,8 @@
+ #include "ui/gfx/geometry/size.h"
+
+ enum LayoutConstant {
++  // The vertical padding of the tab strip and the toolbar.
++  TOP_BAR_VERTICAL_PADDING,
+   // The size of the avatar icon in the profile row of the app menu.
+   APP_MENU_PROFILE_ROW_AVATAR_ICON_SIZE,
+

patches/helium/ui/vertical-tabs/disable-compound-tab-container.patch

@@ -0,0 +1,32 @@
+--- a/chrome/browser/ui/BUILD.gn
++++ b/chrome/browser/ui/BUILD.gn
+@@ -4279,8 +4279,6 @@ static_library("ui") {
+       "views/tabs/browser_tab_strip_controller.h",
+       "views/tabs/color_picker_view.cc",
+       "views/tabs/color_picker_view.h",
+-      "views/tabs/compound_tab_container.cc",
+-      "views/tabs/compound_tab_container.h",
+       "views/tabs/dragging/drag_session_data.cc",
+       "views/tabs/dragging/drag_session_data.h",
+       "views/tabs/dragging/dragging_tabs_session.cc",
+--- a/chrome/browser/ui/views/tabs/tab_strip.cc
++++ b/chrome/browser/ui/views/tabs/tab_strip.cc
+@@ -59,7 +59,6 @@
+ #include "chrome/browser/ui/view_ids.h"
+ #include "chrome/browser/ui/views/frame/browser_view.h"
+ #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
+-#include "chrome/browser/ui/views/tabs/compound_tab_container.h"
+ #include "chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h"
+ #include "chrome/browser/ui/views/tabs/tab.h"
+ #include "chrome/browser/ui/views/tabs/tab_container_impl.h"
+@@ -135,10 +134,6 @@ std::unique_ptr<TabContainer> MakeTabCon
+     TabStrip* tab_strip,
+     TabHoverCardController* hover_card_controller,
+     TabDragContext* drag_context) {
+-  if (base::FeatureList::IsEnabled(tabs::kSplitTabStrip)) {
+-    return std::make_unique<CompoundTabContainer>(
+-        *tab_strip, hover_card_controller, drag_context, *tab_strip, tab_strip);
+-  }
+   return std::make_unique<TabContainerImpl>(
+       *tab_strip, hover_card_controller, drag_context, *tab_strip, tab_strip);
+ }

patches/helium/ui/vertical-tabs/feature-flag.patch

@@ -0,0 +1,56 @@
+--- a/chrome/browser/ui/tabs/features.cc
++++ b/chrome/browser/ui/tabs/features.cc
+@@ -57,6 +57,10 @@ BASE_FEATURE(kTabSelectionByPointer,
+              "TabSelectionByPointer",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+
++BASE_FEATURE(kHeliumVerticalTabs,
++             "HeliumVerticalTabs",
++             base::FEATURE_DISABLED_BY_DEFAULT);
++
+ bool CanShowTabSearchPositionSetting() {
+   // Alternate tab search locations cannot be repositioned.
+   if (features::HasTabSearchToolbarButton()) {
+@@ -79,4 +83,8 @@ bool AreVerticalTabsEnabled() {
+   return base::FeatureList::IsEnabled(kVerticalTabs);
+ }
+
++bool AreHeliumVerticalTabsEnabled() {
++  return base::FeatureList::IsEnabled(kHeliumVerticalTabs);
++}
++
+ }  // namespace tabs
+--- a/chrome/browser/ui/tabs/features.h
++++ b/chrome/browser/ui/tabs/features.h
+@@ -38,6 +38,9 @@ extern bool CanShowTabSearchPositionSett
+ extern bool AreTabGroupShortcutsEnabled();
+ extern bool AreVerticalTabsEnabled();
+
++BASE_DECLARE_FEATURE(kHeliumVerticalTabs);
++extern bool AreHeliumVerticalTabsEnabled();
++
+ }  // namespace tabs
+
+ #endif  // CHROME_BROWSER_UI_TABS_FEATURES_H_
+--- a/chrome/browser/helium_flag_choices.h
++++ b/chrome/browser/helium_flag_choices.h
+@@ -31,6 +31,8 @@ namespace helium {
+   constexpr const char kAudioContextJitterCommandLine[] = "fingerprinting-audio-context-jitter";
+   constexpr const char kMiddleClickAutoscrollCommandLine[] = "middle-click-autoscroll";
+
++  constexpr const char kHeliumVerticalTabsCommandLine[] = "helium-vertical-tabs";
++
+ }  // namespace helium
+
+ #endif  /* CHROME_BROWSER_HELIUM_FLAG_CHOICES_H_ */
+--- a/chrome/browser/helium_flag_entries.h
++++ b/chrome/browser/helium_flag_entries.h
+@@ -28,4 +28,8 @@
+      "Middle Click Autoscroll",
+      "Enables autoscroll on middle click. Helium flag, Chromium feature.",
+      kOsDesktop, FEATURE_VALUE_TYPE(blink::features::kHeliumMiddleClickAutoscroll)},
++    {helium::kHeliumVerticalTabsCommandLine,
++     "Enable Helium Vertical Tabs",
++     "Enables experimental vertical tabs layout in Helium. Will be unstable and buggy, WIP. Helium flag.",
++     kOsDesktop, FEATURE_VALUE_TYPE(tabs::kHeliumVerticalTabs)},
+ #endif  /* CHROME_BROWSER_HELIUM_FLAG_ENTRIES_H_ */