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/lib/bluetooth_chooser.h
View file

@ -25,6 +25,10 @@ class BluetoothChooser : public content::BluetoothChooser {
const EventHandler& handler);
~BluetoothChooser() override;
// disable copy
BluetoothChooser(const BluetoothChooser&) = delete;
BluetoothChooser& operator=(const BluetoothChooser&) = delete;
// content::BluetoothChooser:
void SetAdapterPresence(AdapterPresence presence) override;
void ShowDiscoveryState(DiscoveryState state) override;
@ -43,8 +47,6 @@ class BluetoothChooser : public content::BluetoothChooser {
int num_retries_ = 0;
bool refreshing_ = false;
bool rescan_ = false;
DISALLOW_COPY_AND_ASSIGN(BluetoothChooser);
};
} // namespace electron

7
shell/browser/lib/power_observer_linux.h
View file

@ -8,7 +8,6 @@
#include <string>
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/power_monitor/power_observer.h"
#include "dbus/bus.h"
@ -22,6 +21,10 @@ class PowerObserverLinux {
explicit PowerObserverLinux(base::PowerSuspendObserver* suspend_observer);
~PowerObserverLinux();
// disable copy
PowerObserverLinux(const PowerObserverLinux&) = delete;
PowerObserverLinux& operator=(const PowerObserverLinux&) = delete;
void SetShutdownHandler(base::RepeatingCallback<bool()> should_shutdown);
private:
@ -46,8 +49,6 @@ class PowerObserverLinux {
base::ScopedFD sleep_lock_;
base::ScopedFD shutdown_lock_;
base::WeakPtrFactory<PowerObserverLinux> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(PowerObserverLinux);
};
} // namespace electron