rebase

brave · Sep 18, 2023 · 79cae2c · 79cae2c
1 parent c5d348b
commit 79cae2c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/browser/ui/views/frame/vertical_tab_strip_root_view_browsertest.cc b/browser/ui/views/frame/vertical_tab_strip_root_view_browsertest.cc
@@ -4,7 +4,6 @@
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "brave/browser/ui/browser_commands.h"
-#include "brave/browser/ui/tabs/features.h"
 #include "brave/browser/ui/views/frame/brave_browser_view.h"
 #include "brave/browser/ui/views/frame/vertical_tab_strip_region_view.h"
 #include "brave/browser/ui/views/frame/vertical_tab_strip_root_view.h"
@@ -23,14 +22,12 @@
 
 class VerticalTabStripRootViewBrowserTest : public InProcessBrowserTest {
  public:
-  VerticalTabStripRootViewBrowserTest() {
-    feature_list_.InitAndEnableFeature(tabs::features::kBraveVerticalTabs);
-  }
-
+  VerticalTabStripRootViewBrowserTest() = default;
   VerticalTabStripRootViewBrowserTest(
       const VerticalTabStripRootViewBrowserTest&) = delete;
   VerticalTabStripRootViewBrowserTest& operator=(
       const VerticalTabStripRootViewBrowserTest&) = delete;
+  ~VerticalTabStripRootViewBrowserTest() override = default;
 
   Tab* GetTabAt(int index) { return tab_strip()->tab_at(index); }
 
@@ -65,8 +62,6 @@ class VerticalTabStripRootViewBrowserTest : public InProcessBrowserTest {
     }
     return nullptr;
   }
-
-  base::test::ScopedFeatureList feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(VerticalTabStripRootViewBrowserTest,

diff --git a/browser/ui/views/tabs/brave_compound_tab_container.cc b/browser/ui/views/tabs/brave_compound_tab_container.cc
@@ -302,8 +302,7 @@ int BraveCompoundTabContainer::GetUnpinnedContainerIdealLeadingX() const {
 
 BrowserRootView::DropIndex BraveCompoundTabContainer::GetDropIndex(
     const ui::DropTargetEvent& event) {
-  if (!base::FeatureList::IsEnabled(tabs::features::kBraveVerticalTabs) ||
-      !ShouldShowVerticalTabs()) {
+  if (!ShouldShowVerticalTabs()) {
     return CompoundTabContainer::GetDropIndex(event);
   }
 

diff --git a/browser/ui/views/tabs/brave_tab_container.cc b/browser/ui/views/tabs/brave_tab_container.cc
@@ -310,8 +310,7 @@ void BraveTabContainer::PaintChildren(const views::PaintInfo& paint_info) {
 
 BrowserRootView::DropIndex BraveTabContainer::GetDropIndex(
     const ui::DropTargetEvent& event) {
-  if (!base::FeatureList::IsEnabled(tabs::features::kBraveVerticalTabs) ||
-      !tabs::utils::ShouldShowVerticalTabs(
+  if (!tabs::utils::ShouldShowVerticalTabs(
           tab_slot_controller_->GetBrowser())) {
     return TabContainerImpl::GetDropIndex(event);
   }
@@ -440,8 +439,7 @@ void BraveTabContainer::DropArrow::OnWidgetDestroying(views::Widget* widget) {
 
 void BraveTabContainer::HandleDragUpdate(
     const absl::optional<BrowserRootView::DropIndex>& index) {
-  if (!base::FeatureList::IsEnabled(tabs::features::kBraveVerticalTabs) ||
-      !tabs::utils::ShouldShowVerticalTabs(
+  if (!tabs::utils::ShouldShowVerticalTabs(
           tab_slot_controller_->GetBrowser())) {
     TabContainerImpl::HandleDragUpdate(index);
     return;
@@ -450,8 +448,7 @@ void BraveTabContainer::HandleDragUpdate(
 }
 
 void BraveTabContainer::HandleDragExited() {
-  if (!base::FeatureList::IsEnabled(tabs::features::kBraveVerticalTabs) ||
-      !tabs::utils::ShouldShowVerticalTabs(
+  if (!tabs::utils::ShouldShowVerticalTabs(
           tab_slot_controller_->GetBrowser())) {
     TabContainerImpl::HandleDragExited();
     return;