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

refactor: migrate deprecated LazyInstance code to NoDestructor (#40927)

Browse source 
* refactor: do not use deprecated NoDestructor in javascript_environment.cc

* refactor: do not use deprecated NoDestructor in window_list.cc
This commit is contained in:
Charles Kerr 2024-01-10 14:01:49 -06:00 • committed by GitHub
parent c2c64d27fd
commit fac964ac0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
shell/browser/window_list.cc
View file

@ -7,6 +7,7 @@
#include <algorithm>
#include "base/logging.h"
#include "base/no_destructor.h"
#include "shell/browser/native_window.h"
#include "shell/browser/window_list_observer.h"
@ -24,10 +25,6 @@ std::vector<base::WeakPtr<T>> ConvertToWeakPtrVector(std::vector<T*> raw_ptrs) {
namespace electron {
// static
base::LazyInstance<base::ObserverList<WindowListObserver>>::Leaky
WindowList::observers_ = LAZY_INSTANCE_INITIALIZER;
// static
WindowList* WindowList::instance_ = nullptr;
@ -55,7 +52,7 @@ void WindowList::AddWindow(NativeWindow* window) {
WindowVector& windows = GetInstance()->windows_;
windows.push_back(window);
for (WindowListObserver& observer : observers_.Get())
for (WindowListObserver& observer : GetObservers())
observer.OnWindowAdded(window);
}
@ -65,29 +62,29 @@ void WindowList::RemoveWindow(NativeWindow* window) {
windows.erase(std::remove(windows.begin(), windows.end(), window),
windows.end());
for (WindowListObserver& observer : observers_.Get())
for (WindowListObserver& observer : GetObservers())
observer.OnWindowRemoved(window);
if (windows.empty()) {
for (WindowListObserver& observer : observers_.Get())
for (WindowListObserver& observer : GetObservers())
observer.OnWindowAllClosed();
}
}
// static
void WindowList::WindowCloseCancelled(NativeWindow* window) {
for (WindowListObserver& observer : observers_.Get())
for (WindowListObserver& observer : GetObservers())
observer.OnWindowCloseCancelled(window);
}
// static
void WindowList::AddObserver(WindowListObserver* observer) {
observers_.Get().AddObserver(observer);
GetObservers().AddObserver(observer);
}
// static
void WindowList::RemoveObserver(WindowListObserver* observer) {
observers_.Get().RemoveObserver(observer);
GetObservers().RemoveObserver(observer);
}
// static
@ -118,4 +115,10 @@ WindowList::WindowList() = default;
WindowList::~WindowList() = default;
// static
base::ObserverList<WindowListObserver>& WindowList::GetObservers() {
static base::NoDestructor<base::ObserverList<WindowListObserver>> instance;
return *instance;
}
} // namespace electron