fix: views::NonClientFrameView -> views::FrameView

samuelmaddock · samuelmaddock · commit 1e86b6ddfb2d · 2025-10-08T15:47:27.000-04:00
https://chromium-review.googlesource.com/c/chromium/src/+/7005027 https://chromium-review.googlesource.com/c/chromium/src/+/6966937
diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h
@@ -225,7 +225,7 @@ class NativeWindowMac : public NativeWindow,
   // views::WidgetDelegate:
   views::View* GetContentsView() override;
   bool CanMaximize() const override;
-  std::unique_ptr<views::NonClientFrameView> CreateNonClientFrameView(
+  std::unique_ptr<views::FrameView> CreateFrameView(
       views::Widget* widget) override;
   void OnWidgetInitialized() override;
 
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
@@ -1718,8 +1718,8 @@ static bool FromV8(v8::Isolate* isolate,
   const raw_ptr<NativeWindowMac, DanglingUntriaged> native_app_window_;
 };
 
-std::unique_ptr<views::NonClientFrameView>
-NativeWindowMac::CreateNonClientFrameView(views::Widget* widget) {
+std::unique_ptr<views::FrameView> NativeWindowMac::CreateFrameView(
+    views::Widget* widget) {
   CHECK(!frame_view_client_);
   frame_view_client_ =
       std::make_unique<NativeAppWindowFrameViewMacClient>(widget, this);
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
@@ -1842,8 +1842,8 @@ views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) {
   return new NativeWindowClientView{widget, &root_view_, this};
 }
 
-std::unique_ptr<views::NonClientFrameView>
-NativeWindowViews::CreateNonClientFrameView(views::Widget* widget) {
+std::unique_ptr<views::FrameView> NativeWindowViews::CreateFrameView(
+    views::Widget* widget) {
 #if BUILDFLAG(IS_WIN)
   auto frame_view = std::make_unique<WinFrameView>();
   frame_view->Init(this, widget);
@@ -1870,7 +1870,7 @@ electron::ClientFrameViewLinux* NativeWindowViews::GetClientFrameViewLinux() {
   // Check to make sure this window's non-client frame view is a
   // ClientFrameViewLinux.  If either has_frame() or has_client_frame()
   // are false, it will be an OpaqueFrameView or NativeFrameView instead.
-  // See NativeWindowViews::CreateNonClientFrameView.
+  // See NativeWindowViews::CreateFrameView.
   if (!has_frame() || !has_client_frame())
     return {};
   return static_cast<ClientFrameViewLinux*>(
diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
@@ -190,7 +190,7 @@ class NativeWindowViews : public NativeWindow,
   SkColor overlay_symbol_color() const { return overlay_symbol_color_; }
 
 #if BUILDFLAG(IS_LINUX)
-  // returns the ClientFrameViewLinux iff that is our NonClientFrameView type,
+  // returns the ClientFrameViewLinux iff that is our FrameView type,
   // nullptr otherwise.
   ClientFrameViewLinux* GetClientFrameViewLinux();
 #endif
@@ -219,7 +219,7 @@ class NativeWindowViews : public NativeWindow,
       gfx::NativeView child,
       const gfx::Point& location) override;
   views::ClientView* CreateClientView(views::Widget* widget) override;
-  std::unique_ptr<views::NonClientFrameView> CreateNonClientFrameView(
+  std::unique_ptr<views::FrameView> CreateFrameView(
       views::Widget* widget) override;
   void OnWidgetMove() override;
 #if BUILDFLAG(IS_WIN)
diff --git a/shell/browser/ui/views/client_frame_view_linux.cc b/shell/browser/ui/views/client_frame_view_linux.cc
@@ -495,7 +495,7 @@ gfx::Size ClientFrameViewLinux::SizeWithDecorations(gfx::Size size) const {
 
 views::View* ClientFrameViewLinux::TargetForRect(views::View* root,
                                                  const gfx::Rect& rect) {
-  return views::NonClientFrameView::TargetForRect(root, rect);
+  return views::FrameView::TargetForRect(root, rect);
 }
 
 int ClientFrameViewLinux::GetTranslucentTopAreaHeight() const {
diff --git a/shell/browser/ui/views/client_frame_view_linux.h b/shell/browser/ui/views/client_frame_view_linux.h
@@ -64,7 +64,7 @@ class ClientFrameViewLinux : public FramelessView,
   // Overridden from FramelessView:
   int ResizingBorderHitTest(const gfx::Point& point) override;
 
-  // Overridden from views::NonClientFrameView:
+  // Overridden from views::FrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
diff --git a/shell/browser/ui/views/electron_views_delegate.cc b/shell/browser/ui/views/electron_views_delegate.cc
@@ -60,8 +60,8 @@ gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
 }
 #endif
 
-std::unique_ptr<views::NonClientFrameView>
-ViewsDelegate::CreateDefaultNonClientFrameView(views::Widget* widget) {
+std::unique_ptr<views::FrameView> ViewsDelegate::CreateDefaultFrameView(
+    views::Widget* widget) {
   return nullptr;
 }
 
diff --git a/shell/browser/ui/views/electron_views_delegate.h b/shell/browser/ui/views/electron_views_delegate.h
@@ -47,7 +47,7 @@ class ViewsDelegate : public views::ViewsDelegate {
 #elif BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
   gfx::ImageSkia* GetDefaultWindowIcon() const override;
 #endif
-  std::unique_ptr<views::NonClientFrameView> CreateDefaultNonClientFrameView(
+  std::unique_ptr<views::FrameView> CreateDefaultFrameView(
       views::Widget* widget) override;
   void AddRef() override {}
   void ReleaseRef() override {}
diff --git a/shell/browser/ui/views/frameless_view.cc b/shell/browser/ui/views/frameless_view.cc
@@ -96,7 +96,7 @@ views::View* FramelessView::TargetForRect(views::View* root,
   if (NonClientHitTest(rect.origin()) != HTCLIENT)
     return this;
 
-  return NonClientFrameView::TargetForRect(root, rect);
+  return FrameView::TargetForRect(root, rect);
 }
 
 gfx::Size FramelessView::CalculatePreferredSize(
diff --git a/shell/browser/ui/views/frameless_view.h b/shell/browser/ui/views/frameless_view.h
@@ -17,8 +17,8 @@ namespace electron {
 
 class NativeWindowViews;
 
-class FramelessView : public views::NonClientFrameView {
-  METADATA_HEADER(FramelessView, views::NonClientFrameView)
+class FramelessView : public views::FrameView {
+  METADATA_HEADER(FramelessView, views::FrameView)
 
  public:
   FramelessView();
@@ -46,7 +46,7 @@ class FramelessView : public views::NonClientFrameView {
   int ResizingBorderHitTestImpl(const gfx::Point& point,
                                 const gfx::Insets& resize_border);
 
-  // views::NonClientFrameView:
+  // views::FrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
diff --git a/shell/browser/ui/views/opaque_frame_view.cc b/shell/browser/ui/views/opaque_frame_view.cc
@@ -160,7 +160,7 @@ int OpaqueFrameView::NonClientHitTest(const gfx::Point& point) {
 }
 
 void OpaqueFrameView::ResetWindowControls() {
-  NonClientFrameView::ResetWindowControls();
+  FrameView::ResetWindowControls();
 
   if (restore_button_)
     restore_button_->SetState(views::Button::STATE_NORMAL);
@@ -173,7 +173,7 @@ void OpaqueFrameView::ResetWindowControls() {
 
 views::View* OpaqueFrameView::TargetForRect(views::View* root,
                                             const gfx::Rect& rect) {
-  return views::NonClientFrameView::TargetForRect(root, rect);
+  return views::FrameView::TargetForRect(root, rect);
 }
 
 void OpaqueFrameView::Layout(PassKey) {
diff --git a/shell/browser/ui/views/opaque_frame_view.h b/shell/browser/ui/views/opaque_frame_view.h
@@ -40,7 +40,7 @@ class OpaqueFrameView : public FramelessView {
   int ResizingBorderHitTest(const gfx::Point& point) override;
   void InvalidateCaptionButtons() override;
 
-  // views::NonClientFrameView:
+  // views::FrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc
@@ -89,7 +89,7 @@ views::View* WinFrameView::TargetForRect(views::View* root,
       return this;
   }
 
-  return NonClientFrameView::TargetForRect(root, rect);
+  return FrameView::TargetForRect(root, rect);
 }
 
 int WinFrameView::NonClientHitTest(const gfx::Point& point) {
@@ -170,7 +170,7 @@ void WinFrameView::Layout(PassKey) {
   if (window()->IsWindowControlsOverlayEnabled()) {
     LayoutWindowControlsOverlay();
   }
-  LayoutSuperclass<NonClientFrameView>(this);
+  LayoutSuperclass<FrameView>(this);
 }
 
 int WinFrameView::FrameTopBorderThickness(bool restored) const {
diff --git a/shell/browser/ui/views/win_frame_view.h b/shell/browser/ui/views/win_frame_view.h
@@ -31,7 +31,7 @@ class WinFrameView : public FramelessView {
 
   SkColor GetReadableFeatureColor(SkColor background_color);
 
-  // views::NonClientFrameView:
+  // views::FrameView:
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
   int NonClientHitTest(const gfx::Point& point) override;

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ gfx::Size ClientFrameViewLinux::SizeWithDecorations(gfx::Size size) const {`
`495`	`495`
`496`	`496`	`views::View* ClientFrameViewLinux::TargetForRect(views::View* root,`
`497`	`497`	`const gfx::Rect& rect) {`
`498`		`- return views::NonClientFrameView::TargetForRect(root, rect);`
	`498`	`+ return views::FrameView::TargetForRect(root, rect);`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`int ClientFrameViewLinux::GetTranslucentTopAreaHeight() const {`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {`
`60`	`60`	`}`
`61`	`61`	`#endif`
`62`	`62`
`63`		`-std::unique_ptr<views::NonClientFrameView>`
`64`		`-ViewsDelegate::CreateDefaultNonClientFrameView(views::Widget* widget) {`
	`63`	`+std::unique_ptr<views::FrameView> ViewsDelegate::CreateDefaultFrameView(`
	`64`	`+ views::Widget* widget) {`
`65`	`65`	`return nullptr;`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ views::View* FramelessView::TargetForRect(views::View* root,`
`96`	`96`	`if (NonClientHitTest(rect.origin()) != HTCLIENT)`
`97`	`97`	`return this;`
`98`	`98`
`99`		`- return NonClientFrameView::TargetForRect(root, rect);`
	`99`	`+ return FrameView::TargetForRect(root, rect);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`gfx::Size FramelessView::CalculatePreferredSize(`