Cleanup for PR

browser/ui/brave_browser.cc

@@ -18,7 +18,6 @@
 #include "brave/browser/ui/brave_file_select_utils.h"
 #include "brave/browser/ui/tabs/brave_tab_prefs.h"
 #include "brave/browser/ui/tabs/features.h"
-#include "brave/browser/ui/views/frame/brave_contents_view_util.h"
 #include "brave/components/constants/pref_names.h"
 #include "chrome/browser/lifetime/browser_close_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ -58,12 +57,6 @@ bool BraveBrowser::ShouldUseBraveWebViewRoundedCorners(Browser* browser) {
          browser->is_type_normal();
 }
 
-int BraveBrowser::GetRoundedCornersWebViewMargin(Browser* browser) {
-  return ShouldUseBraveWebViewRoundedCorners(browser)
-             ? BraveContentsViewUtil::kMarginThickness
-             : 0;
-}
-
 BraveBrowser::BraveBrowser(const CreateParams& params) : Browser(params) {
 #if defined(TOOLKIT_VIEWS)
   if (!sidebar::CanUseSidebar(this)) {

browser/ui/brave_browser.h

@@ -32,7 +32,6 @@ class BraveBrowser : public Browser {
   BraveBrowser& operator=(const BraveBrowser&) = delete;
 
   static bool ShouldUseBraveWebViewRoundedCorners(Browser* browser);
-  static int GetRoundedCornersWebViewMargin(Browser* browser);
 
   // Browser overrides:
   void ScheduleUIUpdate(content::WebContents* source,

browser/ui/views/frame/brave_browser_view_layout.cc

@@ -269,7 +269,8 @@ void BraveBrowserViewLayout::UpdateContentsContainerInsets(
   // In rounded corners mode, we need to include a little margin so we have
   // somewhere to draw the shadow.
   int contents_margin_for_rounded_corners =
-      BraveBrowser::GetRoundedCornersWebViewMargin(browser_view_->browser());
+      BraveContentsViewUtil::GetRoundedCornersWebViewMargin(
+          browser_view_->browser());
 
   // Don't need contents container's left or right margin with vertical tab as
   // vertical tab itself has sufficient padding.

browser/ui/views/frame/brave_contents_view_util.cc

@@ -5,6 +5,8 @@
 
 #include "brave/browser/ui/views/frame/brave_contents_view_util.h"
 
+#include "brave/browser/ui/brave_browser.h"
+#include "chrome/browser/ui/browser.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/view.h"
 
@@ -25,3 +27,9 @@ std::unique_ptr<ViewShadow> BraveContentsViewUtil::CreateShadow(
   view->layer()->SetIsFastRoundedCorner(true);
   return shadow;
 }
+
+int BraveContentsViewUtil::GetRoundedCornersWebViewMargin(Browser* browser) {
+  return BraveBrowser::ShouldUseBraveWebViewRoundedCorners(browser)
+             ? BraveContentsViewUtil::kMarginThickness
+             : 0;
+}

browser/ui/views/frame/brave_contents_view_util.h

@@ -10,6 +10,8 @@
 
 #include "brave/browser/ui/views/view_shadow.h"
 
+class Browser;
+
 namespace views {
 class View;
 }
@@ -28,6 +30,10 @@ class BraveContentsViewUtil {
 
   // Creates a drop shadow for the specified content area view.
   static std::unique_ptr<ViewShadow> CreateShadow(views::View* view);
+
+  // If rounded corners are enabled, returns the additional margin required to
+  // get the shadow to display properly. Otherwise 0.
+  static int GetRoundedCornersWebViewMargin(Browser* browser);
 };
 
 #endif  // BRAVE_BROWSER_UI_VIEWS_FRAME_BRAVE_CONTENTS_VIEW_UTIL_H_

browser/ui/views/frame/vertical_tab_strip_region_view.cc

@@ -16,6 +16,7 @@
 #include "brave/browser/ui/brave_browser.h"
 #include "brave/browser/ui/color/brave_color_id.h"
 #include "brave/browser/ui/tabs/brave_tab_prefs.h"
+#include "brave/browser/ui/views/frame/brave_contents_view_util.h"
 #include "brave/browser/ui/views/tabs/brave_new_tab_button.h"
 #include "brave/browser/ui/views/tabs/brave_tab_search_button.h"
 #include "brave/browser/ui/views/tabs/brave_tab_strip_layout_helper.h"
@@ -1225,9 +1226,10 @@ void VerticalTabStripRegionView::UpdateBorder() {
       !vertical_tab_on_right_.GetPrefName().empty() && *vertical_tab_on_right_;
   bool sidebar_on_same_side = sidebar_side_.GetValue() == is_on_right;
   int inset =
-      1 - (sidebar_on_same_side
-               ? 0
-               : BraveBrowser::GetRoundedCornersWebViewMargin(browser_));
+      1 -
+      (sidebar_on_same_side
+           ? 0
+           : BraveContentsViewUtil::GetRoundedCornersWebViewMargin(browser_));
   gfx::Insets border_insets = (is_on_right) ? gfx::Insets::TLBR(0, inset, 0, 0)
                                             : gfx::Insets::TLBR(0, 0, 0, inset);
 

browser/ui/views/side_panel/brave_side_panel.cc

@@ -24,10 +24,8 @@
 #include "chrome/browser/ui/views/side_panel/side_panel_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/color/color_provider.h"
-#include "ui/gfx/geometry/insets.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
-#include "ui/views/view_class_properties.h"
 
 BraveSidePanel::BraveSidePanel(BrowserView* browser_view,
                                HorizontalAlignment horizontal_alignment)
@@ -74,7 +72,9 @@ bool BraveSidePanel::IsRightAligned() {
 void BraveSidePanel::UpdateBorder() {
   if (BraveBrowser::ShouldUseBraveWebViewRoundedCorners(
           browser_view_->browser())) {
-    SetBorder(views::NullBorder());
+    // Use a negative top border to hide the separator inserted by the upstream
+    // side panel implementation.
+    SetBorder(views::CreateEmptyBorder(gfx::Insets::TLBR(-1, 0, 0, 0)));
     return;
   }
 

browser/ui/views/sidebar/sidebar_control_view.cc

@@ -11,6 +11,7 @@
 #include "brave/browser/ui/sidebar/sidebar_controller.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
 #include "brave/browser/ui/sidebar/sidebar_utils.h"
+#include "brave/browser/ui/views/frame/brave_contents_view_util.h"
 #include "brave/browser/ui/views/sidebar/sidebar_item_add_button.h"
 #include "brave/browser/ui/views/sidebar/sidebar_items_scroll_view.h"
 #include "brave/components/l10n/common/localization_util.h"
@@ -89,7 +90,7 @@ void SidebarControlView::UpdateBackgroundAndBorder() {
     SetBackground(
         views::CreateSolidBackground(color_provider->GetColor(kColorToolbar)));
     int border_thickness =
-        1 - BraveBrowser::GetRoundedCornersWebViewMargin(browser_);
+        1 - BraveContentsViewUtil::GetRoundedCornersWebViewMargin(browser_);
     SetBorder(views::CreateEmptyBorder(
         gfx::Insets::TLBR(0, sidebar_on_left_ ? 0 : border_thickness, 0,
                           sidebar_on_left_ ? border_thickness : 0)));