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

9
shell/common/extensions/electron_extensions_api_provider.h
View file

@ -7,7 +7,6 @@
#include <string>
#include "base/macros.h"
#include "extensions/common/extensions_api_provider.h"
namespace electron {
@ -17,6 +16,11 @@ class ElectronExtensionsAPIProvider : public extensions::ExtensionsAPIProvider {
ElectronExtensionsAPIProvider();
~ElectronExtensionsAPIProvider() override;
// disable copy
ElectronExtensionsAPIProvider(const ElectronExtensionsAPIProvider&) = delete;
ElectronExtensionsAPIProvider& operator=(
const ElectronExtensionsAPIProvider&) = delete;
// ExtensionsAPIProvider:
void AddAPIFeatures(extensions::FeatureProvider* provider) override;
void AddManifestFeatures(extensions::FeatureProvider* provider) override;
@ -29,9 +33,6 @@ class ElectronExtensionsAPIProvider : public extensions::ExtensionsAPIProvider {
void RegisterPermissions(
extensions::PermissionsInfo* permissions_info) override;
void RegisterManifestHandlers() override;
private:
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionsAPIProvider);
};
} // namespace electron

10
shell/common/extensions/electron_extensions_client.cc
View file

@ -9,7 +9,6 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/macros.h"
#include "components/version_info/version_info.h"
#include "content/public/common/user_agent.h"
#include "extensions/common/core_extensions_api_provider.h"
@ -33,6 +32,12 @@ class ElectronPermissionMessageProvider
ElectronPermissionMessageProvider() = default;
~ElectronPermissionMessageProvider() override = default;
// disable copy
ElectronPermissionMessageProvider(const ElectronPermissionMessageProvider&) =
delete;
ElectronPermissionMessageProvider& operator=(
const ElectronPermissionMessageProvider&) = delete;
// PermissionMessageProvider implementation.
extensions::PermissionMessages GetPermissionMessages(
const extensions::PermissionIDSet& permissions) const override {
@ -53,9 +58,6 @@ class ElectronPermissionMessageProvider
extensions::Manifest::Type extension_type) const override {
return extensions::PermissionIDSet();
}
private:
DISALLOW_COPY_AND_ASSIGN(ElectronPermissionMessageProvider);
};
base::LazyInstance<ElectronPermissionMessageProvider>::DestructorAtExit

7
shell/common/extensions/electron_extensions_client.h
View file

@ -8,7 +8,6 @@
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "extensions/common/extensions_client.h"
#include "url/gurl.h"
@ -30,6 +29,10 @@ class ElectronExtensionsClient : public extensions::ExtensionsClient {
ElectronExtensionsClient();
~ElectronExtensionsClient() override;
// disable copy
ElectronExtensionsClient(const ElectronExtensionsClient&) = delete;
ElectronExtensionsClient& operator=(const ElectronExtensionsClient&) = delete;
// ExtensionsClient overrides:
void Initialize() override;
void InitializeWebStoreUrls(base::CommandLine* command_line) override;
@ -55,8 +58,6 @@ class ElectronExtensionsClient : public extensions::ExtensionsClient {
const GURL webstore_base_url_;
const GURL webstore_update_url_;
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionsClient);
};
} // namespace electron