mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: replace deprecated DISALLOW_COPY_AND_ASSIGN (#31633)

Browse source
This commit is contained in:
Milan Burda 2021-11-03 12:41:45 +01:00 • committed by GitHub
parent 2a2a1a834c
commit 65a980c673
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
231 changed files with 918 additions and 576 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/ui/cocoa/delayed_native_view_host.h
View file

@ -16,14 +16,16 @@ class DelayedNativeViewHost : public views::NativeViewHost {
explicit DelayedNativeViewHost(gfx::NativeView native_view);
~DelayedNativeViewHost() override;
// disable copy
DelayedNativeViewHost(const DelayedNativeViewHost&) = delete;
DelayedNativeViewHost& operator=(const DelayedNativeViewHost&) = delete;
// views::View:
void ViewHierarchyChanged(
const views::ViewHierarchyChangedDetails& details) override;
private:
gfx::NativeView native_view_;
DISALLOW_COPY_AND_ASSIGN(DelayedNativeViewHost);
};
} // namespace electron

6
shell/browser/ui/cocoa/electron_native_widget_mac.h
View file

@ -18,6 +18,10 @@ class ElectronNativeWidgetMac : public views::NativeWidgetMac {
views::internal::NativeWidgetDelegate* delegate);
~ElectronNativeWidgetMac() override;
// disable copy
ElectronNativeWidgetMac(const ElectronNativeWidgetMac&) = delete;
ElectronNativeWidgetMac& operator=(const ElectronNativeWidgetMac&) = delete;
protected:
// NativeWidgetMac:
NativeWidgetMacNSWindow* CreateNSWindow(
@ -26,8 +30,6 @@ class ElectronNativeWidgetMac : public views::NativeWidgetMac {
private:
NativeWindowMac* shell_;
NSUInteger style_mask_;
DISALLOW_COPY_AND_ASSIGN(ElectronNativeWidgetMac);
};
} // namespace electron

6
shell/browser/ui/cocoa/root_view_mac.h
View file

@ -16,6 +16,10 @@ class RootViewMac : public views::View {
explicit RootViewMac(NativeWindow* window);
~RootViewMac() override;
// disable copy
RootViewMac(const RootViewMac&) = delete;
RootViewMac& operator=(const RootViewMac&) = delete;
// views::View:
void Layout() override;
gfx::Size GetMinimumSize() const override;
@ -24,8 +28,6 @@ class RootViewMac : public views::View {
private:
// Parent window, weak ref.
NativeWindow* window_;
DISALLOW_COPY_AND_ASSIGN(RootViewMac);
};
} // namespace electron

7
shell/browser/ui/cocoa/views_delegate_mac.h
View file

@ -14,14 +14,15 @@ class ViewsDelegateMac : public views::ViewsDelegate {
ViewsDelegateMac();
~ViewsDelegateMac() override;
// disable copy
ViewsDelegateMac(const ViewsDelegateMac&) = delete;
ViewsDelegateMac& operator=(const ViewsDelegateMac&) = delete;
// ViewsDelegate:
void OnBeforeWidgetInit(
views::Widget::InitParams* params,
views::internal::NativeWidgetDelegate* delegate) override;
ui::ContextFactory* GetContextFactory() override;
private:
DISALLOW_COPY_AND_ASSIGN(ViewsDelegateMac);
};
} // namespace electron