[Cr131 follow up][Linux] Fixes dragging window by toolbar. (uplift to…

… 1.72.x) (#26368) Uplift of #26366 (squashed) to beta
brave · Nov 5, 2024 · f144f47 · f144f47
1 parent 006f304
commit f144f47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/browser/ui/views/frame/brave_non_client_hit_test_helper_browsertest.cc b/browser/ui/views/frame/brave_non_client_hit_test_helper_browsertest.cc
@@ -17,14 +17,7 @@ using BraveNonClientHitTestHelperBrowserTest = InProcessBrowserTest;
 
 // TODO(sko) It might be good to have resizable area tests. But testing it
 // is pretty flaky depending on platforms.
-// The test is failing on Linux CI in Chromium 131, but passes locally:
-// https://github.com/brave/brave-browser/issues/41674
-#if BUILDFLAG(IS_LINUX)
-#define MAYBE_Toolbar DISABLED_Toolbar
-#else
-#define MAYBE_Toolbar Toolbar
-#endif  // BUILDFLAG(IS_LINUX)
-IN_PROC_BROWSER_TEST_F(BraveNonClientHitTestHelperBrowserTest, MAYBE_Toolbar) {
+IN_PROC_BROWSER_TEST_F(BraveNonClientHitTestHelperBrowserTest, Toolbar) {
   auto* browser_view = static_cast<BrowserView*>(browser()->window());
   auto* toolbar = browser_view->toolbar();
   // Upstream has two more children |background_view_left_| and

diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_frame_view_linux.cc b/chromium_src/chrome/browser/ui/views/frame/browser_frame_view_linux.cc
@@ -6,9 +6,6 @@
 #include "chrome/browser/ui/views/frame/browser_frame_view_linux.h"
 #include "brave/browser/ui/views/frame/brave_opaque_browser_frame_view.h"
 
-#define OpaqueBrowserFrameView(frame, browser_view, layout) \
-  BraveOpaqueBrowserFrameView(frame, browser_view, layout)
-
+#define OpaqueBrowserFrameView BraveOpaqueBrowserFrameView
 #include "src/chrome/browser/ui/views/frame/browser_frame_view_linux.cc"
-
 #undef OpaqueBrowserFrameView