From 0904e6809686ea3b8305f526c1b0bb63b9dc014e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Sun, 29 Mar 2026 16:36:51 +0100 Subject: [PATCH] [cr148] Hovercard sources moved into their own path Chromium changes: https://chromium.googlesource.com/chromium/src/+/e3daf97890c890d4843b63b3e4e6b5d738a6ae4b commit e3daf97890c890d4843b63b3e4e6b5d738a6ae4b Author: Eshwar Stalin Date: Thu Mar 26 11:05:06 2026 -0700 Creating a hovercard folder under c/b/ui/views/tabs Bypass-Check-License: Moving existing files Change-Id: Ic3aab57ddccef6a7b6aeedb508f733261d36665d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7641849 Reviewed-by: Steven Luong Commit-Queue: Eshwar Stalin Cr-Commit-Position: refs/heads/main@{#1605665} --- browser/ui/views/tabs/brave_tab_hover_browsertest.cc | 4 ++-- .../ui/views/tabs/brave_tab_hover_card_controller.cc | 6 +++--- .../ui/views/tabs/brave_tab_hover_card_controller.h | 2 +- .../{ => hovercard}/tab_hover_card_bubble_view.cc | 8 ++++---- .../{ => hovercard}/tab_hover_card_bubble_view.h | 10 +++++----- .../tabs/{ => hovercard}/tab_hover_card_controller.h | 10 +++++----- .../tab_hover_card_controller_browsertest.cc | 2 +- .../tabs/{ => hovercard}/tab_hover_card_test_util.cc | 4 ++-- chromium_src/chrome/browser/ui/views/tabs/tab.h | 2 +- .../tabs/tab_hover_card_bubble_view_browsertest.cc | 2 +- ...tabs-hovercard-tab_hover_card_bubble_view.h.patch | 12 ++++++++++++ ...-ui-views-tabs-tab_hover_card_bubble_view.h.patch | 12 ------------ 12 files changed, 37 insertions(+), 37 deletions(-) rename chromium_src/chrome/browser/ui/views/tabs/{ => hovercard}/tab_hover_card_bubble_view.cc (86%) rename chromium_src/chrome/browser/ui/views/tabs/{ => hovercard}/tab_hover_card_bubble_view.h (77%) rename chromium_src/chrome/browser/ui/views/tabs/{ => hovercard}/tab_hover_card_controller.h (58%) rename chromium_src/chrome/browser/ui/views/tabs/{ => hovercard}/tab_hover_card_controller_browsertest.cc (78%) rename chromium_src/chrome/browser/ui/views/tabs/{ => hovercard}/tab_hover_card_test_util.cc (84%) create mode 100644 patches/chrome-browser-ui-views-tabs-hovercard-tab_hover_card_bubble_view.h.patch delete mode 100644 patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch diff --git a/browser/ui/views/tabs/brave_tab_hover_browsertest.cc b/browser/ui/views/tabs/brave_tab_hover_browsertest.cc index 490d9cac6e7..e4754c02880 100644 --- a/browser/ui/views/tabs/brave_tab_hover_browsertest.cc +++ b/browser/ui/views/tabs/brave_tab_hover_browsertest.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/thumbnails/thumbnail_tab_helper.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller.h" #include "chrome/browser/ui/views/tabs/tab.h" #include "chrome/browser/ui/views/tabs/tab_container.h" -#include "chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h" -#include "chrome/browser/ui/views/tabs/tab_hover_card_controller.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/prefs/pref_service.h" diff --git a/browser/ui/views/tabs/brave_tab_hover_card_controller.cc b/browser/ui/views/tabs/brave_tab_hover_card_controller.cc index 66e4d46f4a2..6689ca83583 100644 --- a/browser/ui/views/tabs/brave_tab_hover_card_controller.cc +++ b/browser/ui/views/tabs/brave_tab_hover_card_controller.cc @@ -11,10 +11,10 @@ #include "brave/browser/ui/tabs/brave_tab_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_thumbnail_observer.h" #include "chrome/browser/ui/views/tabs/tab.h" -#include "chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h" -#include "chrome/browser/ui/views/tabs/tab_hover_card_controller.h" -#include "chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" BraveTabHoverCardController::~BraveTabHoverCardController() = default; diff --git a/browser/ui/views/tabs/brave_tab_hover_card_controller.h b/browser/ui/views/tabs/brave_tab_hover_card_controller.h index 478ad2d2397..523473ca7ea 100644 --- a/browser/ui/views/tabs/brave_tab_hover_card_controller.h +++ b/browser/ui/views/tabs/brave_tab_hover_card_controller.h @@ -6,7 +6,7 @@ #ifndef BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_HOVER_CARD_CONTROLLER_H_ #define BRAVE_BROWSER_UI_VIEWS_TABS_BRAVE_TAB_HOVER_CARD_CONTROLLER_H_ -#include "chrome/browser/ui/views/tabs/tab_hover_card_controller.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller.h" class HoverCardAnchorTarget; diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.cc similarity index 86% rename from chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc rename to chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.cc index 66e96362ffb..8824ce2ed29 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.cc @@ -1,9 +1,9 @@ /* Copyright (c) 2019 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * you can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h" #include @@ -12,14 +12,14 @@ #include "brave/browser/ui/tabs/brave_tab_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller.h" #include "chrome/browser/ui/views/tabs/tab.h" -#include "chrome/browser/ui/views/tabs/tab_hover_card_controller.h" #include "chrome/browser/ui/views/tabs/tab_slot_controller.h" #include "content/public/common/url_constants.h" #include "ui/views/controls/label.h" #define TabHoverCardBubbleView TabHoverCardBubbleView_ChromiumImpl -#include +#include #undef TabHoverCardBubbleView bool TabHoverCardBubbleView_ChromiumImpl::HasThumbnailView() const { diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h similarity index 77% rename from chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h rename to chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h index a59be48cba2..9aa17fb9361 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h +++ b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h @@ -1,10 +1,10 @@ /* Copyright (c) 2019 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * you can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_HOVER_CARD_BUBBLE_VIEW_H_ -#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_HOVER_CARD_BUBBLE_VIEW_H_ +#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_HOVERCARD_TAB_HOVER_CARD_BUBBLE_VIEW_H_ +#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_HOVERCARD_TAB_HOVER_CARD_BUBBLE_VIEW_H_ // Inject a protected method that will have access to the private members of the // base class. Then, we can call this method from the subclass' override. @@ -22,7 +22,7 @@ class TabHoverCardBubbleView; #define UpdateCardContent virtual UpdateCardContent #define SetTargetTabImage virtual SetTargetTabImage #define SetPlaceholderImage virtual SetPlaceholderImage -#include // IWYU pragma: export +#include // IWYU pragma: export #undef SetPlaceholderImage #undef SetTargetTabImage #undef UpdateCardContent @@ -42,4 +42,4 @@ class TabHoverCardBubbleView : public TabHoverCardBubbleView_ChromiumImpl { void SetPlaceholderImage() override; }; -#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_HOVER_CARD_BUBBLE_VIEW_H_ +#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_HOVERCARD_TAB_HOVER_CARD_BUBBLE_VIEW_H_ diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller.h similarity index 58% rename from chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h rename to chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller.h index fda73738f29..3ee6c90b969 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller.h +++ b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller.h @@ -1,10 +1,10 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * you can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_HOVER_CARD_CONTROLLER_H_ -#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_HOVER_CARD_CONTROLLER_H_ +#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_HOVERCARD_TAB_HOVER_CARD_CONTROLLER_H_ +#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_HOVERCARD_TAB_HOVER_CARD_CONTROLLER_H_ #define CreateHoverCard \ CreateHoverCard_Unused(); \ @@ -16,9 +16,9 @@ OnHovercardImagesEnabledChanged_Unused(); \ virtual void OnHovercardImagesEnabledChanged -#include // IWYU pragma: export +#include // IWYU pragma: export #undef OnHovercardImagesEnabledChanged #undef CreateHoverCard -#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_HOVER_CARD_CONTROLLER_H_ +#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_HOVERCARD_TAB_HOVER_CARD_CONTROLLER_H_ diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_browsertest.cc b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller_browsertest.cc similarity index 78% rename from chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_browsertest.cc rename to chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller_browsertest.cc index ff89af3db9e..60835931cce 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_browsertest.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_controller_browsertest.cc @@ -5,4 +5,4 @@ #include "brave/browser/ui/views/tabs/brave_tab_hover_card_controller.h" -#include +#include diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_test_util.cc b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_test_util.cc similarity index 84% rename from chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_test_util.cc rename to chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_test_util.cc index 32dbbfbc440..5b7aafc825e 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_test_util.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_test_util.cc @@ -1,7 +1,7 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * you can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ // This following include is needed because of the upstream change // https://chromium.googlesource.com/chromium/src/+/4021762e. It added @@ -12,4 +12,4 @@ // member access into incomplete type error. #include "brave/browser/ui/views/tabs/brave_tab_hover_card_controller.h" -#include +#include diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab.h b/chromium_src/chrome/browser/ui/views/tabs/tab.h index 12abbb4afac..c0233fe3b9f 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab.h +++ b/chromium_src/chrome/browser/ui/views/tabs/tab.h @@ -7,7 +7,7 @@ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ #include "base/memory/raw_ref.h" -#include "chrome/browser/ui/views/tabs/hover_card_anchor_target.h" +#include "chrome/browser/ui/views/tabs/hovercard/hover_card_anchor_target.h" #include "chrome/browser/ui/views/tabs/tab_slot_controller.h" #include "components/tabs/public/tab_interface.h" diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc index 1cfc72ae529..11f12df6ff1 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_data.h" #include "chrome/browser/ui/test/test_browser_dialog.h" +#include "chrome/browser/ui/views/tabs/hovercard/tab_hover_card_test_util.h" #include "chrome/browser/ui/views/tabs/tab.h" -#include "chrome/browser/ui/views/tabs/tab_hover_card_test_util.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "content/public/test/browser_test.h" #include "url/gurl.h" diff --git a/patches/chrome-browser-ui-views-tabs-hovercard-tab_hover_card_bubble_view.h.patch b/patches/chrome-browser-ui-views-tabs-hovercard-tab_hover_card_bubble_view.h.patch new file mode 100644 index 00000000000..163eb8824f4 --- /dev/null +++ b/patches/chrome-browser-ui-views-tabs-hovercard-tab_hover_card_bubble_view.h.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h b/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h +index 3a567d99d155bfe9ecb64edfda982ae5def46ee2..a4eee8b3a40d6d2536788fe0356a74dae07c9dba 100644 +--- a/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h ++++ b/chrome/browser/ui/views/tabs/hovercard/tab_hover_card_bubble_view.h +@@ -104,6 +104,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { + // available, or `std::nullopt` to disable crossfades entirely. + static std::optional GetPreviewImageCrossfadeStart(); + ++ BRAVE_TAB_HOVER_CARD_BUBBLE_VIEW_H_ + protected: + class ThumbnailView; + diff --git a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch deleted file mode 100644 index 358aefe0a00..00000000000 --- a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -index 1ecbe60beaff6cc85cc0d70854a799976f460c56..f80d3af0588526a9b6dee8bfbddfe3610386fe5d 100644 ---- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -+++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -@@ -99,6 +99,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { - // available, or `std::nullopt` to disable crossfades entirely. - static std::optional GetPreviewImageCrossfadeStart(); - -+ BRAVE_TAB_HOVER_CARD_BUBBLE_VIEW_H_ - protected: - class ThumbnailView; -