[Vertical Tabs] Update WebUI Tab Strip Tab Search Handling Logic

This CL builds upon the changes to the pinnable property. It extends the
logic to the WebUITabStrip, so that we consider the tab search action
item as "not pinnable" when the WebUITabStrip is present.

Change-Id: Ia3072475f82fecb4183d8f07ec8237fa4ef78210
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7006660
Reviewed-by: Eshwar Stalin <[email protected]>
Reviewed-by: David Pennington <[email protected]>
Commit-Queue: Kunal Daftari <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1532396}

Author: kunaldaftari-google

chrome/browser/ui/browser_window/internal/browser_window_features.cc

@@ -511,8 +511,7 @@ void BrowserWindowFeatures::InitPostWindowConstruction(Browser* browser) {
       // BrowserWithTestWindowTest; these should eventually be refactored.
       if (browser_view) {
         tab_search_toolbar_button_controller_ =
-            std::make_unique<TabSearchToolbarButtonController>(
-                browser_view, browser_view->GetTabSearchBubbleHost());
+            std::make_unique<TabSearchToolbarButtonController>(browser_view);
       }
     }
 

chrome/browser/ui/toolbar/pinned_toolbar/tab_search_toolbar_button_controller.cc

@@ -14,15 +14,8 @@
 #include "chrome/common/chrome_features.h"
 
 TabSearchToolbarButtonController::TabSearchToolbarButtonController(
-    BrowserView* browser_view,
-    TabSearchBubbleHost* tab_search_bubble_host)
-    : browser_view_(browser_view) {
-  tab_search_bubble_host_observation_.Observe(tab_search_bubble_host);
-  // https://crbug.com/435137909: This class is created post window
-  // construction. Need to call this again because this class does not exist
-  // when ToolbarView tries to call it from init.
-  UpdateForWebUITabStrip();
-}
+    BrowserView* browser_view)
+    : browser_view_(browser_view) {}
 
 TabSearchToolbarButtonController::~TabSearchToolbarButtonController() = default;
 
@@ -59,16 +52,22 @@ void TabSearchToolbarButtonController::OnBubbleDestroying() {
       base::Seconds(1));
 }
 
-void TabSearchToolbarButtonController::UpdateForWebUITabStrip() {
-  PinnedToolbarActionsContainer* pinned_toolbar_actions_container =
-      browser_view_->toolbar()->pinned_toolbar_actions_container();
-  if (pinned_toolbar_actions_container) {
-    actions::ActionItem* tab_search_action =
-        pinned_toolbar_actions_container->GetActionItemFor(kActionTabSearch);
-    if (tab_search_action) {
-      // Do not make tab search button available if webui tab strip is enabled.
-      tab_search_action->SetVisible(!browser_view_->webui_tab_strip());
-    }
+void TabSearchToolbarButtonController::UpdateBubbleHost(
+    TabSearchBubbleHost* new_tab_search_bubble_host) {
+  tab_search_bubble_host_observation_.Reset();
+
+  actions::ActionItem* action_item = GetTabSearchActionItem();
+  CHECK(action_item);
+
+  if (new_tab_search_bubble_host) {
+    action_item->SetProperty(
+        actions::kActionItemPinnableKey,
+        static_cast<int>(actions::ActionPinnableState::kPinnable));
+    tab_search_bubble_host_observation_.Observe(new_tab_search_bubble_host);
+  } else {
+    action_item->SetProperty(
+        actions::kActionItemPinnableKey,
+        static_cast<int>(actions::ActionPinnableState::kNotPinnable));
   }
 }
 

chrome/browser/ui/toolbar/pinned_toolbar/tab_search_toolbar_button_controller.h

@@ -19,8 +19,7 @@ class TabSearchBubbleHost;
 
 class TabSearchToolbarButtonController : public TabSearchBubbleHostObserver {
  public:
-  TabSearchToolbarButtonController(BrowserView* browser_view,
-                                   TabSearchBubbleHost* tab_search_bubble_host);
+  explicit TabSearchToolbarButtonController(BrowserView* browser_view);
   ~TabSearchToolbarButtonController() override;
 
   TabSearchToolbarButtonController(const TabSearchToolbarButtonController&) =
@@ -32,7 +31,7 @@ class TabSearchToolbarButtonController : public TabSearchBubbleHostObserver {
   void OnBubbleInitializing() override;
   void OnBubbleDestroying() override;
 
-  void UpdateForWebUITabStrip();
+  void UpdateBubbleHost(TabSearchBubbleHost* new_tab_search_bubble_host);
 
  private:
   void MaybeHideActionEphemerallyInToolbar();

chrome/browser/ui/views/frame/browser_view.cc

@@ -4354,6 +4354,26 @@ BookmarkBar::State BrowserView::bookmark_bar_state() const {
   return BookmarkBarController::From(browser_.get())->bookmark_bar_state();
 }
 
+void BrowserView::UpdateTabSearchBubbleHost() {
+  if (!GetIsNormalType()) {
+    return;
+  }
+
+  if (features::HasTabSearchToolbarButton()) {
+    tab_search_bubble_host_ = std::make_unique<TabSearchBubbleHost>(
+        toolbar_->tab_search_button(), browser_.get());
+    if (auto* controller = browser_->browser_window_features()
+                               ->tab_search_toolbar_button_controller()) {
+      controller->UpdateBubbleHost(tab_search_bubble_host_.get());
+    }
+  } else {
+    tab_search_bubble_host_ = std::make_unique<TabSearchBubbleHost>(
+        BrowserElementsViews::From(browser_.get())
+            ->GetViewAs<TabSearchButton>(kTabSearchButtonElementId),
+        browser_.get());
+  }
+}
+
 void BrowserView::ShowSplitView(bool focus_active_view) {
   CHECK(multi_contents_view_);
   const int active_index = browser_->tab_strip_model()->active_index();
@@ -4932,17 +4952,7 @@ void BrowserView::AddedToWidget() {
 
   toolbar_->Init();
 
-  if (GetIsNormalType()) {
-    if (features::HasTabSearchToolbarButton()) {
-      tab_search_bubble_host_ = std::make_unique<TabSearchBubbleHost>(
-          toolbar_->tab_search_button(), browser_.get());
-    } else {
-      tab_search_bubble_host_ = std::make_unique<TabSearchBubbleHost>(
-          BrowserElementsViews::From(browser_.get())
-              ->GetViewAs<TabSearchButton>(kTabSearchButtonElementId),
-          browser_.get());
-    }
-  }
+  UpdateTabSearchBubbleHost();
 
   // TODO(pbos): Investigate whether the side panels should be creatable when
   // the ToolbarView does not create a button for them. This specifically seems
@@ -5181,6 +5191,13 @@ void BrowserView::MaybeInitializeWebUITabStrip() {
   GetBrowserViewLayout()->set_loading_bar(loading_bar_);
   if (toolbar_) {
     toolbar_->UpdateForWebUITabStrip();
+
+    // Do not show Tab Search bubble host when web ui tab strip is enabled.
+    if (auto* tab_search_toolbar_button_controller =
+            browser_->browser_window_features()
+                ->tab_search_toolbar_button_controller()) {
+      tab_search_toolbar_button_controller->UpdateBubbleHost(nullptr);
+    }
   }
 #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
 }

chrome/browser/ui/views/frame/browser_view.h

@@ -901,6 +901,9 @@ class BrowserView : public BrowserWindow,
   // Returns the state of the bookmark bar.
   BookmarkBar::State bookmark_bar_state() const;
 
+  // Setter for the BrowserView's TabSearchBubbleHost instance.
+  void UpdateTabSearchBubbleHost();
+
   // Display the current active split view as a series of multiple side-by-side
   // web contents.
   void ShowSplitView(bool focus_active_view);

chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -610,13 +610,6 @@ void ToolbarView::UpdateCustomTabBarVisibility(bool visible, bool animate) {
 
 void ToolbarView::UpdateForWebUITabStrip() {
 #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
-  TabSearchToolbarButtonController* tab_search_toolbar_button_controller =
-      browser_->browser_window_features()
-          ->tab_search_toolbar_button_controller();
-  if (tab_search_toolbar_button_controller) {
-    tab_search_toolbar_button_controller->UpdateForWebUITabStrip();
-  }
-
   if (!new_tab_button_) {
     return;
   }