Skip to content

Fix interactive UI tests build #25841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ilie-Lesan wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix interactive UI tests build #25841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d97c8f
Fix interactive ui tests build
Ilie-Lesan Oct 6, 2024
a4e44e7
Add license header
Ilie-Lesan Oct 7, 2024
83a1fc1
Find a better way to fix the dependency
Ilie-Lesan Oct 8, 2024
aa20d84
Silence pre-submit warnings
Ilie-Lesan Oct 15, 2024
07980b6
Don't disable chromium tests
Ilie-Lesan Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions chromium_src/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */

#include <stddef.h>

namespace chrome {
inline constexpr char kPrivacySandboxManageTopicsURL[] =
"chrome://settings/adPrivacy/interests/manage";
inline constexpr char kPrivacySandboxAdTopicsURL[] =
"chrome://settings/adPrivacy/interests";
} // namespace chrome

#include "src/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc"
12 changes: 12 additions & 0 deletions chromium_src/chrome/browser/ui/views/side_search/side_search_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */

#include "brave/browser/ui/views/side_panel/brave_side_panel.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/side_panel/side_panel.h"

#define SidePanel BraveSidePanel
#include "src/chrome/browser/ui/views/side_search/side_search_browsertest.cc"
#undef SidePanel
2 changes: 2 additions & 0 deletions chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ void TabHoverCardBubbleView::SetPlaceholderImage() {
}
TabHoverCardBubbleView_ChromiumImpl::SetPlaceholderImage();
}
BEGIN_METADATA(TabHoverCardBubbleView)
END_METADATA
2 changes: 2 additions & 0 deletions chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

// 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.
#include "ui/base/metadata/metadata_header_macros.h"
#include "ui/gfx/image/image_skia.h"

class TabHoverCardBubbleView;
Expand All @@ -32,6 +33,7 @@ class TabHoverCardBubbleView;
#undef BRAVE_TAB_HOVER_CARD_BUBBLE_VIEW_H_

class TabHoverCardBubbleView : public TabHoverCardBubbleView_ChromiumImpl {
METADATA_HEADER(TabHoverCardBubbleView, TabHoverCardBubbleView_ChromiumImpl)
public:
using TabHoverCardBubbleView_ChromiumImpl::
TabHoverCardBubbleView_ChromiumImpl;
Expand Down
9 changes: 9 additions & 0 deletions chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* Copyright (c) 2024 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 https://mozilla.org/MPL/2.0/. */

#include "brave/browser/ui/views/tabs/brave_tab_hover_card_controller.h"

// Add this comment so that the pre-submit warnings are silenced
#include "src/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc"