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/common/gin_helper/trackable_object.h
View file

@ -24,6 +24,10 @@ class TrackableObjectBase : public CleanedUpAtExit {
public:
TrackableObjectBase();
// disable copy
TrackableObjectBase(const TrackableObjectBase&) = delete;
TrackableObjectBase& operator=(const TrackableObjectBase&) = delete;
// The ID in weak map.
int32_t weak_map_id() const { return weak_map_id_; }
@ -45,8 +49,6 @@ class TrackableObjectBase : public CleanedUpAtExit {
void Destroy();
base::WeakPtrFactory<TrackableObjectBase> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(TrackableObjectBase);
};
// All instances of TrackableObject will be kept in a weak map and can be got
@ -125,8 +127,6 @@ class TrackableObject : public TrackableObjectBase, public EventEmitter<T> {
private:
static int32_t next_id_;
static electron::KeyWeakMap<int32_t>* weak_map_; // leaked on purpose
DISALLOW_COPY_AND_ASSIGN(TrackableObject);
};
template <typename T>