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

8
shell/browser/ui/x/event_disabler.h
View file

@ -7,7 +7,6 @@
#include <memory>
#include "base/macros.h"
#include "ui/events/event_rewriter.h"
namespace electron {
@ -17,6 +16,10 @@ class EventDisabler : public ui::EventRewriter {
EventDisabler();
~EventDisabler() override;
// disable copy
EventDisabler(const EventDisabler&) = delete;
EventDisabler& operator=(const EventDisabler&) = delete;
// ui::EventRewriter:
ui::EventRewriteStatus RewriteEvent(
const ui::Event& event,
@ -24,9 +27,6 @@ class EventDisabler : public ui::EventRewriter {
ui::EventRewriteStatus NextDispatchEvent(
const ui::Event& last_event,
std::unique_ptr<ui::Event>* new_event) override;
private:
DISALLOW_COPY_AND_ASSIGN(EventDisabler);
};
} // namespace electron

6
shell/browser/ui/x/window_state_watcher.h
View file

@ -17,6 +17,10 @@ class WindowStateWatcher : public x11::EventObserver {
explicit WindowStateWatcher(NativeWindowViews* window);
~WindowStateWatcher() override;
// disable copy
WindowStateWatcher(const WindowStateWatcher&) = delete;
WindowStateWatcher& operator=(const WindowStateWatcher&) = delete;
protected:
// x11::EventObserver:
void OnEvent(const x11::Event& x11_event) override;
@ -31,8 +35,6 @@ class WindowStateWatcher : public x11::EventObserver {
const x11::Atom net_wm_state_maximized_vert_atom_;
const x11::Atom net_wm_state_maximized_horz_atom_;
const x11::Atom net_wm_state_fullscreen_atom_;
DISALLOW_COPY_AND_ASSIGN(WindowStateWatcher);
};
} // namespace electron