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

7
shell/browser/media/media_capture_devices_dispatcher.h
View file

@ -67,6 +67,11 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
blink::mojom::MediaStreamType stream_type,
bool is_secure) override;
// disable copy
MediaCaptureDevicesDispatcher(const MediaCaptureDevicesDispatcher&) = delete;
MediaCaptureDevicesDispatcher& operator=(
const MediaCaptureDevicesDispatcher&) = delete;
private:
friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
@ -81,8 +86,6 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
// Flag used by unittests to disable device enumeration.
bool is_device_enumeration_disabled_ = false;
DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
};
} // namespace electron

7
shell/browser/media/media_device_id_salt.h
View file

@ -7,7 +7,6 @@
#include <string>
#include "base/macros.h"
#include "components/prefs/pref_member.h"
class PrefRegistrySimple;
@ -23,6 +22,10 @@ class MediaDeviceIDSalt {
explicit MediaDeviceIDSalt(PrefService* pref_service);
~MediaDeviceIDSalt();
// disable copy
MediaDeviceIDSalt(const MediaDeviceIDSalt&) = delete;
MediaDeviceIDSalt& operator=(const MediaDeviceIDSalt&) = delete;
std::string GetSalt();
static void RegisterPrefs(PrefRegistrySimple* pref_registry);
@ -30,8 +33,6 @@ class MediaDeviceIDSalt {
private:
StringPrefMember media_device_id_salt_;
DISALLOW_COPY_AND_ASSIGN(MediaDeviceIDSalt);
};
} // namespace electron

7
shell/browser/media/media_stream_devices_controller.h
View file

@ -17,6 +17,11 @@ class MediaStreamDevicesController {
virtual ~MediaStreamDevicesController();
// disable copy
MediaStreamDevicesController(const MediaStreamDevicesController&) = delete;
MediaStreamDevicesController& operator=(const MediaStreamDevicesController&) =
delete;
// Accept or deny the request based on the default policy.
bool TakeAction();
@ -37,8 +42,6 @@ class MediaStreamDevicesController {
bool microphone_requested_;
bool webcam_requested_;
DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
};
} // namespace electron