github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: prefer using base::NoDestructor to base::{Singleton,LazyInstance} (#41400)

Browse Source 
refactor: prefer using base::NoDestructor to base::{Singleton,LazyInstance}
This commit is contained in:
Shelley Vohr
2024-02-23 10:35:20 +01:00
committed by GitHub
parent 26131b23b8
commit e95673b052
12 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shell/browser/extensions/electron_extension_system_factory.cc
View File

@@ -4,6 +4,7 @@
#include "shell/browser/extensions/electron_extension_system_factory.h"
#include "base/no_destructor.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "extensions/browser/extension_prefs_factory.h"
#include "extensions/browser/extension_registry_factory.h"
@@ -21,7 +22,8 @@ ExtensionSystem* ElectronExtensionSystemFactory::GetForBrowserContext(
// static
ElectronExtensionSystemFactory* ElectronExtensionSystemFactory::GetInstance() {
return base::Singleton<ElectronExtensionSystemFactory>::get();
static base::NoDestructor<ElectronExtensionSystemFactory> instance;
return instance.get();
}
ElectronExtensionSystemFactory::ElectronExtensionSystemFactory()

8
shell/browser/extensions/electron_extension_system_factory.h
View File

@@ -5,9 +5,13 @@
#ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_
#define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_
#include "base/memory/singleton.h"
#include "extensions/browser/extension_system_provider.h"
namespace base {
template <typename T>
class NoDestructor;
} // namespace base
namespace extensions {
// A factory that provides ElectronExtensionSystem.
@@ -26,7 +30,7 @@ class ElectronExtensionSystemFactory : public ExtensionSystemProvider {
const ElectronExtensionSystemFactory&) = delete;
private:
friend struct base::DefaultSingletonTraits<ElectronExtensionSystemFactory>;
friend base::NoDestructor<ElectronExtensionSystemFactory>;
ElectronExtensionSystemFactory();
~ElectronExtensionSystemFactory() override;