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

16
shell/browser/extensions/api/management/electron_management_api_delegate.cc
View file

@ -10,7 +10,6 @@
#include <utility>
#include "base/bind.h"
#include "base/macros.h"
#include "base/strings/strcat.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@ -44,11 +43,15 @@ class ManagementSetEnabledFunctionInstallPromptDelegate
}
~ManagementSetEnabledFunctionInstallPromptDelegate() override = default;
// disable copy
ManagementSetEnabledFunctionInstallPromptDelegate(
const ManagementSetEnabledFunctionInstallPromptDelegate&) = delete;
ManagementSetEnabledFunctionInstallPromptDelegate& operator=(
const ManagementSetEnabledFunctionInstallPromptDelegate&) = delete;
private:
base::WeakPtrFactory<ManagementSetEnabledFunctionInstallPromptDelegate>
weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ManagementSetEnabledFunctionInstallPromptDelegate);
};
class ManagementUninstallFunctionUninstallDialogDelegate
@ -63,8 +66,11 @@ class ManagementUninstallFunctionUninstallDialogDelegate
~ManagementUninstallFunctionUninstallDialogDelegate() override = default;
private:
DISALLOW_COPY_AND_ASSIGN(ManagementUninstallFunctionUninstallDialogDelegate);
// disable copy
ManagementUninstallFunctionUninstallDialogDelegate(
const ManagementUninstallFunctionUninstallDialogDelegate&) = delete;
ManagementUninstallFunctionUninstallDialogDelegate& operator=(
const ManagementUninstallFunctionUninstallDialogDelegate&) = delete;
};
} // namespace

10
shell/browser/extensions/api/resources_private/resources_private_api.h
View file

@ -5,7 +5,6 @@
#ifndef SHELL_BROWSER_EXTENSIONS_API_RESOURCES_PRIVATE_RESOURCES_PRIVATE_API_H_
#define SHELL_BROWSER_EXTENSIONS_API_RESOURCES_PRIVATE_RESOURCES_PRIVATE_API_H_
#include "base/macros.h"
#include "extensions/browser/extension_function.h"
namespace extensions {
@ -16,14 +15,17 @@ class ResourcesPrivateGetStringsFunction : public ExtensionFunction {
RESOURCESPRIVATE_GETSTRINGS)
ResourcesPrivateGetStringsFunction();
// disable copy
ResourcesPrivateGetStringsFunction(
const ResourcesPrivateGetStringsFunction&) = delete;
ResourcesPrivateGetStringsFunction& operator=(
const ResourcesPrivateGetStringsFunction&) = delete;
protected:
~ResourcesPrivateGetStringsFunction() override;
// Override from ExtensionFunction:
ExtensionFunction::ResponseAction Run() override;
private:
DISALLOW_COPY_AND_ASSIGN(ResourcesPrivateGetStringsFunction);
};
} // namespace extensions

8
shell/browser/extensions/api/runtime/electron_runtime_api_delegate.h
View file

@ -7,7 +7,6 @@
#include <string>
#include "base/macros.h"
#include "extensions/browser/api/runtime/runtime_api_delegate.h"
namespace content {
@ -21,6 +20,11 @@ class ElectronRuntimeAPIDelegate : public RuntimeAPIDelegate {
explicit ElectronRuntimeAPIDelegate(content::BrowserContext* browser_context);
~ElectronRuntimeAPIDelegate() override;
// disable copy
ElectronRuntimeAPIDelegate(const ElectronRuntimeAPIDelegate&) = delete;
ElectronRuntimeAPIDelegate& operator=(const ElectronRuntimeAPIDelegate&) =
delete;
// RuntimeAPIDelegate implementation.
void AddUpdateObserver(UpdateObserver* observer) override;
void RemoveUpdateObserver(UpdateObserver* observer) override;
@ -33,8 +37,6 @@ class ElectronRuntimeAPIDelegate : public RuntimeAPIDelegate {
private:
content::BrowserContext* browser_context_;
DISALLOW_COPY_AND_ASSIGN(ElectronRuntimeAPIDelegate);
};
} // namespace extensions

1
shell/browser/extensions/api/streams_private/streams_private_api.h
View file

@ -7,7 +7,6 @@
#include <string>
#include "base/macros.h"
#include "third_party/blink/public/mojom/loader/transferrable_url_loader.mojom.h"
namespace extensions {

9
shell/browser/extensions/electron_component_extension_resource_manager.h
View file

@ -11,7 +11,6 @@
#include <string>
#include "base/files/file_path.h"
#include "base/macros.h"
#include "extensions/browser/component_extension_resource_manager.h"
#include "ui/base/webui/resource_path.h"
@ -25,6 +24,12 @@ class ElectronComponentExtensionResourceManager
ElectronComponentExtensionResourceManager();
~ElectronComponentExtensionResourceManager() override;
// disable copy
ElectronComponentExtensionResourceManager(
const ElectronComponentExtensionResourceManager&) = delete;
ElectronComponentExtensionResourceManager& operator=(
const ElectronComponentExtensionResourceManager&) = delete;
// Overridden from ComponentExtensionResourceManager:
bool IsComponentExtensionResource(const base::FilePath& extension_path,
const base::FilePath& resource_path,
@ -43,8 +48,6 @@ class ElectronComponentExtensionResourceManager
// A map from an extension ID to its i18n template replacements.
std::map<std::string, ui::TemplateReplacements>
extension_template_replacements_;
DISALLOW_COPY_AND_ASSIGN(ElectronComponentExtensionResourceManager);
};
} // namespace extensions

7
shell/browser/extensions/electron_display_info_provider.h
View file

@ -5,7 +5,6 @@
#ifndef SHELL_BROWSER_EXTENSIONS_ELECTRON_DISPLAY_INFO_PROVIDER_H_
#define SHELL_BROWSER_EXTENSIONS_ELECTRON_DISPLAY_INFO_PROVIDER_H_
#include "base/macros.h"
#include "extensions/browser/api/system_display/display_info_provider.h"
namespace extensions {
@ -14,8 +13,10 @@ class ElectronDisplayInfoProvider : public DisplayInfoProvider {
public:
ElectronDisplayInfoProvider();
private:
DISALLOW_COPY_AND_ASSIGN(ElectronDisplayInfoProvider);
// disable copy
ElectronDisplayInfoProvider(const ElectronDisplayInfoProvider&) = delete;
ElectronDisplayInfoProvider& operator=(const ElectronDisplayInfoProvider&) =
delete;
};
} // namespace extensions

9
shell/browser/extensions/electron_extension_host_delegate.h
View file

@ -8,7 +8,6 @@
#include <memory>
#include <string>
#include "base/macros.h"
#include "extensions/browser/extension_host_delegate.h"
namespace extensions {
@ -19,6 +18,11 @@ class ElectronExtensionHostDelegate : public ExtensionHostDelegate {
ElectronExtensionHostDelegate();
~ElectronExtensionHostDelegate() override;
// disable copy
ElectronExtensionHostDelegate(const ElectronExtensionHostDelegate&) = delete;
ElectronExtensionHostDelegate& operator=(
const ElectronExtensionHostDelegate&) = delete;
// ExtensionHostDelegate implementation.
void OnExtensionHostCreated(content::WebContents* web_contents) override;
void OnMainFrameCreatedForBackgroundPage(ExtensionHost* host) override;
@ -41,9 +45,6 @@ class ElectronExtensionHostDelegate : public ExtensionHostDelegate {
const viz::SurfaceId& surface_id,
const gfx::Size& natural_size) override;
void ExitPictureInPicture() override;
private:
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionHostDelegate);
};
} // namespace extensions

7
shell/browser/extensions/electron_extension_loader.h
View file

@ -9,7 +9,6 @@
#include <utility>
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "extensions/browser/extension_registrar.h"
@ -33,6 +32,10 @@ class ElectronExtensionLoader : public ExtensionRegistrar::Delegate {
explicit ElectronExtensionLoader(content::BrowserContext* browser_context);
~ElectronExtensionLoader() override;
// disable copy
ElectronExtensionLoader(const ElectronExtensionLoader&) = delete;
ElectronExtensionLoader& operator=(const ElectronExtensionLoader&) = delete;
// Loads an unpacked extension from a directory synchronously. Returns the
// extension on success, or nullptr otherwise.
void LoadExtension(const base::FilePath& extension_dir,
@ -91,8 +94,6 @@ class ElectronExtensionLoader : public ExtensionRegistrar::Delegate {
bool did_schedule_reload_ = false;
base::WeakPtrFactory<ElectronExtensionLoader> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionLoader);
};
} // namespace extensions

9
shell/browser/extensions/electron_extension_message_filter.h
View file

@ -8,7 +8,6 @@
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/sequenced_task_runner_helpers.h"
#include "content/public/browser/browser_message_filter.h"
#include "content/public/browser/browser_thread.h"
@ -31,6 +30,12 @@ class ElectronExtensionMessageFilter : public content::BrowserMessageFilter {
ElectronExtensionMessageFilter(int render_process_id,
content::BrowserContext* browser_context);
// disable copy
ElectronExtensionMessageFilter(const ElectronExtensionMessageFilter&) =
delete;
ElectronExtensionMessageFilter& operator=(
const ElectronExtensionMessageFilter&) = delete;
// content::BrowserMessageFilter methods:
bool OnMessageReceived(const IPC::Message& message) override;
void OverrideThreadForMessage(const IPC::Message& message,
@ -59,8 +64,6 @@ class ElectronExtensionMessageFilter : public content::BrowserMessageFilter {
// may outlive |browser_context_|, so make sure to NULL check if in doubt;
// async calls and the like.
content::BrowserContext* browser_context_;
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionMessageFilter);
};
} // namespace electron

7
shell/browser/extensions/electron_extension_system.h
View file

@ -9,7 +9,6 @@
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/one_shot_event.h"
@ -38,6 +37,10 @@ class ElectronExtensionSystem : public ExtensionSystem {
explicit ElectronExtensionSystem(content::BrowserContext* browser_context);
~ElectronExtensionSystem() override;
// disable copy
ElectronExtensionSystem(const ElectronExtensionSystem&) = delete;
ElectronExtensionSystem& operator=(const ElectronExtensionSystem&) = delete;
// Loads an unpacked extension from a directory. Returns the extension on
// success, or nullptr otherwise.
void LoadExtension(
@ -115,8 +118,6 @@ class ElectronExtensionSystem : public ExtensionSystem {
base::OneShotEvent ready_;
base::WeakPtrFactory<ElectronExtensionSystem> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionSystem);
};
} // namespace extensions

9
shell/browser/extensions/electron_extension_system_factory.h
View file

@ -5,7 +5,6 @@
#ifndef SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_
#define SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_
#include "base/macros.h"
#include "base/memory/singleton.h"
#include "extensions/browser/extension_system_provider.h"
@ -20,6 +19,12 @@ class ElectronExtensionSystemFactory : public ExtensionSystemProvider {
static ElectronExtensionSystemFactory* GetInstance();
// disable copy
ElectronExtensionSystemFactory(const ElectronExtensionSystemFactory&) =
delete;
ElectronExtensionSystemFactory& operator=(
const ElectronExtensionSystemFactory&) = delete;
private:
friend struct base::DefaultSingletonTraits<ElectronExtensionSystemFactory>;
@ -32,8 +37,6 @@ class ElectronExtensionSystemFactory : public ExtensionSystemProvider {
content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const override;
bool ServiceIsCreatedWithBrowserContext() const override;
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionSystemFactory);
};
} // namespace extensions

9
shell/browser/extensions/electron_extension_web_contents_observer.h
View file

@ -5,7 +5,6 @@
#ifndef SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_WEB_CONTENTS_OBSERVER_H_
#define SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_WEB_CONTENTS_OBSERVER_H_
#include "base/macros.h"
#include "content/public/browser/web_contents_user_data.h"
#include "extensions/browser/extension_web_contents_observer.h"
@ -19,6 +18,12 @@ class ElectronExtensionWebContentsObserver
public:
~ElectronExtensionWebContentsObserver() override;
// disable copy
ElectronExtensionWebContentsObserver(
const ElectronExtensionWebContentsObserver&) = delete;
ElectronExtensionWebContentsObserver& operator=(
const ElectronExtensionWebContentsObserver&) = delete;
// Creates and initializes an instance of this class for the given
// |web_contents|, if it doesn't already exist.
static void CreateForWebContents(content::WebContents* web_contents);
@ -31,8 +36,6 @@ class ElectronExtensionWebContentsObserver
content::WebContents* web_contents);
WEB_CONTENTS_USER_DATA_KEY_DECL();
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionWebContentsObserver);
};
} // namespace extensions

18
shell/browser/extensions/electron_extensions_api_client.cc
View file

@ -37,15 +37,18 @@ class ElectronGuestViewManagerDelegate
: ExtensionsGuestViewManagerDelegate(context) {}
~ElectronGuestViewManagerDelegate() override = default;
// disable copy
ElectronGuestViewManagerDelegate(const ElectronGuestViewManagerDelegate&) =
delete;
ElectronGuestViewManagerDelegate& operator=(
const ElectronGuestViewManagerDelegate&) = delete;
// GuestViewManagerDelegate:
void OnGuestAdded(content::WebContents* guest_web_contents) const override {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::HandleScope scope(isolate);
electron::api::WebContents::FromOrCreate(isolate, guest_web_contents);
}
private:
DISALLOW_COPY_AND_ASSIGN(ElectronGuestViewManagerDelegate);
};
class ElectronMimeHandlerViewGuestDelegate
@ -54,6 +57,12 @@ class ElectronMimeHandlerViewGuestDelegate
ElectronMimeHandlerViewGuestDelegate() = default;
~ElectronMimeHandlerViewGuestDelegate() override = default;
// disable copy
ElectronMimeHandlerViewGuestDelegate(
const ElectronMimeHandlerViewGuestDelegate&) = delete;
ElectronMimeHandlerViewGuestDelegate& operator=(
const ElectronMimeHandlerViewGuestDelegate&) = delete;
// MimeHandlerViewGuestDelegate.
bool HandleContextMenu(content::WebContents* web_contents,
const content::ContextMenuParams& params) override {
@ -63,9 +72,6 @@ class ElectronMimeHandlerViewGuestDelegate
}
void RecordLoadMetric(bool in_main_frame,
const std::string& mime_type) override {}
private:
DISALLOW_COPY_AND_ASSIGN(ElectronMimeHandlerViewGuestDelegate);
};
ElectronExtensionsAPIClient::ElectronExtensionsAPIClient() = default;

10
shell/browser/extensions/electron_extensions_browser_api_provider.h
View file

@ -5,7 +5,6 @@
#ifndef SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSIONS_BROWSER_API_PROVIDER_H_
#define SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSIONS_BROWSER_API_PROVIDER_H_
#include "base/macros.h"
#include "extensions/browser/extensions_browser_api_provider.h"
namespace extensions {
@ -16,10 +15,13 @@ class ElectronExtensionsBrowserAPIProvider
ElectronExtensionsBrowserAPIProvider();
~ElectronExtensionsBrowserAPIProvider() override;
void RegisterExtensionFunctions(ExtensionFunctionRegistry* registry) override;
// disable copy
ElectronExtensionsBrowserAPIProvider(
const ElectronExtensionsBrowserAPIProvider&) = delete;
ElectronExtensionsBrowserAPIProvider& operator=(
const ElectronExtensionsBrowserAPIProvider&) = delete;
private:
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionsBrowserAPIProvider);
void RegisterExtensionFunctions(ExtensionFunctionRegistry* registry) override;
};
} // namespace extensions

9
shell/browser/extensions/electron_extensions_browser_client.h
View file

@ -10,7 +10,6 @@
#include <vector>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "build/build_config.h"
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/browser/kiosk/kiosk_delegate.h"
@ -39,6 +38,12 @@ class ElectronExtensionsBrowserClient
ElectronExtensionsBrowserClient();
~ElectronExtensionsBrowserClient() override;
// disable copy
ElectronExtensionsBrowserClient(const ElectronExtensionsBrowserClient&) =
delete;
ElectronExtensionsBrowserClient& operator=(
const ElectronExtensionsBrowserClient&) = delete;
// ExtensionsBrowserClient overrides:
bool IsShuttingDown() override;
bool AreExtensionsDisabled(const base::CommandLine& command_line,
@ -138,8 +143,6 @@ class ElectronExtensionsBrowserClient
std::unique_ptr<extensions::ElectronComponentExtensionResourceManager>
resource_manager_;
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionsBrowserClient);
};
} // namespace electron

8
shell/browser/extensions/electron_messaging_delegate.h
View file

@ -18,6 +18,11 @@ class ElectronMessagingDelegate : public MessagingDelegate {
ElectronMessagingDelegate();
~ElectronMessagingDelegate() override;
// disable copy
ElectronMessagingDelegate(const ElectronMessagingDelegate&) = delete;
ElectronMessagingDelegate& operator=(const ElectronMessagingDelegate&) =
delete;
// MessagingDelegate:
PolicyPermission IsNativeMessagingHostAllowed(
content::BrowserContext* browser_context,
@ -48,9 +53,6 @@ class ElectronMessagingDelegate : public MessagingDelegate {
content::WebContents* source_contents,
const GURL& url,
base::OnceCallback<void(bool)> callback) override;
private:
DISALLOW_COPY_AND_ASSIGN(ElectronMessagingDelegate);
};
} // namespace extensions

7
shell/browser/extensions/electron_navigation_ui_data.h
View file

@ -7,7 +7,6 @@
#include <memory>
#include "base/macros.h"
#include "content/public/browser/navigation_ui_data.h"
#include "extensions/browser/extension_navigation_ui_data.h"
@ -25,6 +24,10 @@ class ElectronNavigationUIData : public content::NavigationUIData {
content::NavigationHandle* navigation_handle);
~ElectronNavigationUIData() override;
// disable copy
ElectronNavigationUIData(const ElectronNavigationUIData&) = delete;
ElectronNavigationUIData& operator=(const ElectronNavigationUIData&) = delete;
// Creates a new ChromeNavigationUIData that is a deep copy of the original.
// Any changes to the original after the clone is created will not be
// reflected in the clone. |extension_data_| is deep copied.
@ -40,8 +43,6 @@ class ElectronNavigationUIData : public content::NavigationUIData {
private:
// Manages the lifetime of optional ExtensionNavigationUIData information.
std::unique_ptr<ExtensionNavigationUIData> extension_data_;
DISALLOW_COPY_AND_ASSIGN(ElectronNavigationUIData);
};
} // namespace extensions

10
shell/browser/extensions/electron_process_manager_delegate.h
View file

@ -6,7 +6,6 @@
#define SHELL_BROWSER_EXTENSIONS_ELECTRON_PROCESS_MANAGER_DELEGATE_H_
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "extensions/browser/process_manager_delegate.h"
@ -23,6 +22,12 @@ class ElectronProcessManagerDelegate : public ProcessManagerDelegate {
ElectronProcessManagerDelegate();
~ElectronProcessManagerDelegate() override;
// disable copy
ElectronProcessManagerDelegate(const ElectronProcessManagerDelegate&) =
delete;
ElectronProcessManagerDelegate& operator=(
const ElectronProcessManagerDelegate&) = delete;
// ProcessManagerDelegate implementation:
bool AreBackgroundPagesAllowedForContext(
content::BrowserContext* context) const override;
@ -31,9 +36,6 @@ class ElectronProcessManagerDelegate : public ProcessManagerDelegate {
const Extension& extension) const override;
bool DeferCreatingStartupBackgroundHosts(
content::BrowserContext* context) const override;
private:
DISALLOW_COPY_AND_ASSIGN(ElectronProcessManagerDelegate);
};
} // namespace extensions