Commit 5a1a0625 authored by Thomas Lukaszewicz's avatar Thomas Lukaszewicz Committed by Commit Bot

Views: Remove original Tab Search entrypoint from toolbar

The dependent CL adds an entrypoint for Tab Search in the tab strip.
As a result the current toolbar button entrypoint is no longer
necessary.

Bug: 1099917
Change-Id: I68a0fdbb4bf1bbc08e65f048c132593fa5229d3c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2341942Reviewed-by: default avatarAllen Bauer <kylixrd@chromium.org>
Commit-Queue: Thomas Lukaszewicz <tluk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795974}
parent ae177cd5
...@@ -3874,8 +3874,6 @@ static_library("ui") { ...@@ -3874,8 +3874,6 @@ static_library("ui") {
"views/toolbar/reload_button.h", "views/toolbar/reload_button.h",
"views/toolbar/sharesheet_button.cc", "views/toolbar/sharesheet_button.cc",
"views/toolbar/sharesheet_button.h", "views/toolbar/sharesheet_button.h",
"views/toolbar/tab_search_button.cc",
"views/toolbar/tab_search_button.h",
"views/toolbar/toolbar_account_icon_container_view.cc", "views/toolbar/toolbar_account_icon_container_view.cc",
"views/toolbar/toolbar_account_icon_container_view.h", "views/toolbar/toolbar_account_icon_container_view.h",
"views/toolbar/toolbar_action_view.cc", "views/toolbar/toolbar_action_view.cc",
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
#include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
#include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/ui_features.h"
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/toolbar/tab_search_button.h"
#include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/browser/ui/webui/tab_search/tab_search_ui.h"
#include "chrome/common/webui_url_constants.h" #include "chrome/common/webui_url_constants.h"
#include "content/public/test/browser_test.h" #include "content/public/test/browser_test.h"
...@@ -32,7 +30,7 @@ class TabSearchBubbleBrowserTest : public DialogBrowserTest { ...@@ -32,7 +30,7 @@ class TabSearchBubbleBrowserTest : public DialogBrowserTest {
BrowserView* browser_view = BrowserView* browser_view =
BrowserView::GetBrowserViewForBrowser(browser()); BrowserView::GetBrowserViewForBrowser(browser());
DCHECK(browser_view); DCHECK(browser_view);
views::View* anchor_view = browser_view->toolbar()->tab_search_button(); views::View* anchor_view = browser_view->toolbar();
TabSearchBubbleView::CreateTabSearchBubble(browser()->profile(), TabSearchBubbleView::CreateTabSearchBubble(browser()->profile(),
anchor_view); anchor_view);
} }
......
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/views/toolbar/tab_search_button.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/views/tab_search/tab_search_bubble_view.h"
#include "chrome/grit/generated_resources.h"
#include "components/vector_icons/vector_icons.h"
#include "ui/base/l10n/l10n_util.h"
// TODO(crbug.com/1099917): This is a WIP. Implement more detail when design is
// final
TabSearchButton::TabSearchButton(Browser* browser)
: ToolbarButton(this), browser_(browser) {
SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
}
void TabSearchButton::UpdateIcon() {
UpdateIconsWithStandardColors(vector_icons::kFolderIcon);
}
void TabSearchButton::ButtonPressed(views::Button* sender,
const ui::Event& event) {
TabSearchBubbleView::CreateTabSearchBubble(browser_->profile(), this);
}
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TAB_SEARCH_BUTTON_H_
#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TAB_SEARCH_BUTTON_H_
#include "chrome/browser/ui/views/toolbar/toolbar_button.h"
#include "ui/views/controls/button/button.h"
class Browser;
class TabSearchButton : public ToolbarButton, public views::ButtonListener {
public:
explicit TabSearchButton(Browser* browser);
TabSearchButton(const TabSearchButton&) = delete;
TabSearchButton& operator=(const TabSearchButton&) = delete;
~TabSearchButton() override = default;
// ToolbarButton:
void UpdateIcon() override;
// views::ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
private:
Browser* const browser_;
};
#endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TAB_SEARCH_BUTTON_H_
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include "chrome/browser/ui/views/toolbar/home_button.h" #include "chrome/browser/ui/views/toolbar/home_button.h"
#include "chrome/browser/ui/views/toolbar/reload_button.h" #include "chrome/browser/ui/views/toolbar/reload_button.h"
#include "chrome/browser/ui/views/toolbar/sharesheet_button.h" #include "chrome/browser/ui/views/toolbar/sharesheet_button.h"
#include "chrome/browser/ui/views/toolbar/tab_search_button.h"
#include "chrome/browser/ui/views/toolbar/toolbar_account_icon_container_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_account_icon_container_view.h"
#include "chrome/browser/ui/views/toolbar/toolbar_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
#include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/app_browser_controller.h"
...@@ -268,11 +267,6 @@ void ToolbarView::Init() { ...@@ -268,11 +267,6 @@ void ToolbarView::Init() {
if (browser_actions) if (browser_actions)
browser_actions_ = AddChildView(std::move(browser_actions)); browser_actions_ = AddChildView(std::move(browser_actions));
if (base::FeatureList::IsEnabled(features::kTabSearch)) {
tab_search_button_ =
AddChildView(std::make_unique<TabSearchButton>(browser_));
}
if (extensions_container) if (extensions_container)
extensions_container_ = AddChildView(std::move(extensions_container)); extensions_container_ = AddChildView(std::move(extensions_container));
......
...@@ -50,7 +50,6 @@ class HomeButton; ...@@ -50,7 +50,6 @@ class HomeButton;
class MediaToolbarButtonView; class MediaToolbarButtonView;
class ReloadButton; class ReloadButton;
class SharesheetButton; class SharesheetButton;
class TabSearchButton;
class ToolbarButton; class ToolbarButton;
class ToolbarAccountIconContainerView; class ToolbarAccountIconContainerView;
...@@ -153,7 +152,6 @@ class ToolbarView : public views::AccessiblePaneView, ...@@ -153,7 +152,6 @@ class ToolbarView : public views::AccessiblePaneView,
} }
BrowserAppMenuButton* app_menu_button() const { return app_menu_button_; } BrowserAppMenuButton* app_menu_button() const { return app_menu_button_; }
HomeButton* home_button() const { return home_; } HomeButton* home_button() const { return home_; }
TabSearchButton* tab_search_button() const { return tab_search_button_; }
AppMenuIconController* app_menu_icon_controller() { AppMenuIconController* app_menu_icon_controller() {
return &app_menu_icon_controller_; return &app_menu_icon_controller_;
} }
...@@ -278,7 +276,6 @@ class ToolbarView : public views::AccessiblePaneView, ...@@ -278,7 +276,6 @@ class ToolbarView : public views::AccessiblePaneView,
SharesheetButton* sharesheet_button_ = nullptr; SharesheetButton* sharesheet_button_ = nullptr;
MediaToolbarButtonView* media_button_ = nullptr; MediaToolbarButtonView* media_button_ = nullptr;
BrowserAppMenuButton* app_menu_button_ = nullptr; BrowserAppMenuButton* app_menu_button_ = nullptr;
TabSearchButton* tab_search_button_ = nullptr;
Browser* const browser_; Browser* const browser_;
BrowserView* const browser_view_; BrowserView* const browser_view_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment