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

1
shell/renderer/api/electron_api_context_bridge.cc
View file

@ -11,6 +11,7 @@
#include <vector>
#include "base/feature_list.h"
#include "base/macros.h"
#include "base/no_destructor.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h"

6
shell/renderer/api/electron_api_spell_check_client.h
View file

@ -36,6 +36,10 @@ class SpellCheckClient : public blink::WebSpellCheckPanelHostClient,
v8::Local<v8::Object> provider);
~SpellCheckClient() override;
// disable copy
SpellCheckClient(const SpellCheckClient&) = delete;
SpellCheckClient& operator=(const SpellCheckClient&) = delete;
private:
class SpellcheckRequest;
// blink::WebTextCheckClient:
@ -103,8 +107,6 @@ class SpellCheckClient : public blink::WebSpellCheckPanelHostClient,
v8::Global<v8::Context> context_;
v8::Global<v8::Object> provider_;
v8::Global<v8::Function> spell_check_;
DISALLOW_COPY_AND_ASSIGN(SpellCheckClient);
};
} // namespace api

12
shell/renderer/api/electron_api_web_frame.cc
View file

@ -147,6 +147,10 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
~ScriptExecutionCallback() override = default;
// disable copy
ScriptExecutionCallback(const ScriptExecutionCallback&) = delete;
ScriptExecutionCallback& operator=(const ScriptExecutionCallback&) = delete;
void CopyResultToCallingContextAndFinalize(
v8::Isolate* isolate,
const v8::Local<v8::Object>& result) {
@ -248,8 +252,6 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
private:
gin_helper::Promise<v8::Local<v8::Value>> promise_;
CompletionCallback callback_;
DISALLOW_COPY_AND_ASSIGN(ScriptExecutionCallback);
};
class FrameSetSpellChecker : public content::RenderFrameVisitor {
@ -261,6 +263,10 @@ class FrameSetSpellChecker : public content::RenderFrameVisitor {
main_frame->GetWebFrame()->SetSpellCheckPanelHostClient(spell_check_client);
}
// disable copy
FrameSetSpellChecker(const FrameSetSpellChecker&) = delete;
FrameSetSpellChecker& operator=(const FrameSetSpellChecker&) = delete;
bool Visit(content::RenderFrame* render_frame) override {
if (render_frame->GetMainRenderFrame() == main_frame_ ||
(render_frame->IsMainFrame() && render_frame == main_frame_)) {
@ -272,8 +278,6 @@ class FrameSetSpellChecker : public content::RenderFrameVisitor {
private:
SpellCheckClient* spell_check_client_;
content::RenderFrame* main_frame_;
DISALLOW_COPY_AND_ASSIGN(FrameSetSpellChecker);
};
class SpellCheckerHolder final : public content::RenderFrameObserver {

6
shell/renderer/content_settings_observer.h
View file

@ -17,14 +17,16 @@ class ContentSettingsObserver : public content::RenderFrameObserver,
explicit ContentSettingsObserver(content::RenderFrame* render_frame);
~ContentSettingsObserver() override;
// disable copy
ContentSettingsObserver(const ContentSettingsObserver&) = delete;
ContentSettingsObserver& operator=(const ContentSettingsObserver&) = delete;
// blink::WebContentSettingsClient implementation.
bool AllowStorageAccessSync(StorageType storage_type) override;
private:
// content::RenderFrameObserver implementation.
void OnDestruct() override;
DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
};
} // namespace electron

6
shell/renderer/electron_api_service_impl.h
View file

@ -26,6 +26,10 @@ class ElectronApiServiceImpl : public mojom::ElectronRenderer,
RendererClientBase* renderer_client);
~ElectronApiServiceImpl() override;
// disable copy
ElectronApiServiceImpl(const ElectronApiServiceImpl&) = delete;
ElectronApiServiceImpl& operator=(const ElectronApiServiceImpl&) = delete;
void BindTo(mojo::PendingReceiver<mojom::ElectronRenderer> receiver);
void Message(bool internal,
@ -62,8 +66,6 @@ class ElectronApiServiceImpl : public mojom::ElectronRenderer,
RendererClientBase* renderer_client_;
base::WeakPtrFactory<ElectronApiServiceImpl> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ElectronApiServiceImpl);
};
} // namespace electron

6
shell/renderer/electron_autofill_agent.h
View file

@ -29,6 +29,10 @@ class AutofillAgent : public content::RenderFrameObserver,
blink::AssociatedInterfaceRegistry* registry);
~AutofillAgent() override;
// disable copy
AutofillAgent(const AutofillAgent&) = delete;
AutofillAgent& operator=(const AutofillAgent&) = delete;
void BindReceiver(
mojo::PendingAssociatedReceiver<mojom::ElectronAutofillAgent> receiver);
@ -85,8 +89,6 @@ class AutofillAgent : public content::RenderFrameObserver,
mojo::AssociatedReceiver<mojom::ElectronAutofillAgent> receiver_{this};
base::WeakPtrFactory<AutofillAgent> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(AutofillAgent);
};
} // namespace electron

7
shell/renderer/electron_render_frame_observer.h
View file

@ -21,6 +21,11 @@ class ElectronRenderFrameObserver : public content::RenderFrameObserver {
ElectronRenderFrameObserver(content::RenderFrame* frame,
RendererClientBase* renderer_client);
// disable copy
ElectronRenderFrameObserver(const ElectronRenderFrameObserver&) = delete;
ElectronRenderFrameObserver& operator=(const ElectronRenderFrameObserver&) =
delete;
// content::RenderFrameObserver:
void DidClearWindowObject() override;
void DidInstallConditionalFeatures(v8::Handle<v8::Context> context,
@ -41,8 +46,6 @@ class ElectronRenderFrameObserver : public content::RenderFrameObserver {
content::RenderFrame* render_frame_;
RendererClientBase* renderer_client_;
DISALLOW_COPY_AND_ASSIGN(ElectronRenderFrameObserver);
};
} // namespace electron

6
shell/renderer/electron_renderer_client.h
View file

@ -25,6 +25,10 @@ class ElectronRendererClient : public RendererClientBase {
ElectronRendererClient();
~ElectronRendererClient() override;
// disable copy
ElectronRendererClient(const ElectronRendererClient&) = delete;
ElectronRendererClient& operator=(const ElectronRendererClient&) = delete;
// electron::RendererClientBase:
void DidCreateScriptContext(v8::Handle<v8::Context> context,
content::RenderFrame* render_frame) override;
@ -58,8 +62,6 @@ class ElectronRendererClient : public RendererClientBase {
// its script context. Doing so in a web page without scripts would trigger
// assertion, so we have to keep a book of injected web frames.
std::set<content::RenderFrame*> injected_frames_;
DISALLOW_COPY_AND_ASSIGN(ElectronRendererClient);
};
} // namespace electron

9
shell/renderer/electron_renderer_pepper_host_factory.h
View file

@ -8,7 +8,6 @@
#include <memory>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "ppapi/host/host_factory.h"
namespace content {
@ -20,6 +19,12 @@ class ElectronRendererPepperHostFactory : public ppapi::host::HostFactory {
explicit ElectronRendererPepperHostFactory(content::RendererPpapiHost* host);
~ElectronRendererPepperHostFactory() override;
// disable copy
ElectronRendererPepperHostFactory(const ElectronRendererPepperHostFactory&) =
delete;
ElectronRendererPepperHostFactory& operator=(
const ElectronRendererPepperHostFactory&) = delete;
// HostFactory.
std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
ppapi::host::PpapiHost* host,
@ -30,8 +35,6 @@ class ElectronRendererPepperHostFactory : public ppapi::host::HostFactory {
private:
// Not owned by this object.
content::RendererPpapiHost* host_;
DISALLOW_COPY_AND_ASSIGN(ElectronRendererPepperHostFactory);
};
#endif // SHELL_RENDERER_ELECTRON_RENDERER_PEPPER_HOST_FACTORY_H_

1
shell/renderer/electron_sandboxed_renderer_client.cc
View file

@ -9,6 +9,7 @@
#include "base/base_paths.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/path_service.h"
#include "base/process/process_handle.h"
#include "base/process/process_metrics.h"

8
shell/renderer/electron_sandboxed_renderer_client.h
View file

@ -25,6 +25,12 @@ class ElectronSandboxedRendererClient : public RendererClientBase {
ElectronSandboxedRendererClient();
~ElectronSandboxedRendererClient() override;
// disable copy
ElectronSandboxedRendererClient(const ElectronSandboxedRendererClient&) =
delete;
ElectronSandboxedRendererClient& operator=(
const ElectronSandboxedRendererClient&) = delete;
void InitializeBindings(v8::Local<v8::Object> binding,
v8::Local<v8::Context> context,
content::RenderFrame* render_frame);
@ -45,8 +51,6 @@ class ElectronSandboxedRendererClient : public RendererClientBase {
// its script context. Doing so in a web page without scripts would trigger
// assertion, so we have to keep a book of injected web frames.
std::set<content::RenderFrame*> injected_frames_;
DISALLOW_COPY_AND_ASSIGN(ElectronSandboxedRendererClient);
};
} // namespace electron

9
shell/renderer/extensions/electron_extensions_dispatcher_delegate.h
View file

@ -8,7 +8,6 @@
#include <set>
#include <string>
#include "base/macros.h"
#include "extensions/renderer/dispatcher_delegate.h"
class ElectronExtensionsDispatcherDelegate
@ -17,6 +16,12 @@ class ElectronExtensionsDispatcherDelegate
ElectronExtensionsDispatcherDelegate();
~ElectronExtensionsDispatcherDelegate() override;
// disable copy
ElectronExtensionsDispatcherDelegate(
const ElectronExtensionsDispatcherDelegate&) = delete;
ElectronExtensionsDispatcherDelegate& operator=(
const ElectronExtensionsDispatcherDelegate&) = delete;
private:
// extensions::DispatcherDelegate implementation.
void RegisterNativeHandlers(
@ -32,8 +37,6 @@ class ElectronExtensionsDispatcherDelegate
void InitializeBindingsSystem(
extensions::Dispatcher* dispatcher,
extensions::NativeExtensionBindingsSystem* bindings_system) override;
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionsDispatcherDelegate);
};
#endif // SHELL_RENDERER_EXTENSIONS_ELECTRON_EXTENSIONS_DISPATCHER_DELEGATE_H_

9
shell/renderer/extensions/electron_extensions_renderer_client.h
View file

@ -7,7 +7,6 @@
#include <memory>
#include "base/macros.h"
#include "extensions/renderer/extensions_renderer_client.h"
namespace content {
@ -26,6 +25,12 @@ class ElectronExtensionsRendererClient
ElectronExtensionsRendererClient();
~ElectronExtensionsRendererClient() override;
// disable copy
ElectronExtensionsRendererClient(const ElectronExtensionsRendererClient&) =
delete;
ElectronExtensionsRendererClient& operator=(
const ElectronExtensionsRendererClient&) = delete;
// ExtensionsRendererClient implementation.
bool IsIncognitoProcess() const override;
int GetLowestIsolatedWorldId() const override;
@ -42,8 +47,6 @@ class ElectronExtensionsRendererClient
private:
std::unique_ptr<extensions::Dispatcher> dispatcher_;
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionsRendererClient);
};
} // namespace electron

6
shell/renderer/guest_view_container.h
View file

@ -24,6 +24,10 @@ class GuestViewContainer {
explicit GuestViewContainer(content::RenderFrame* render_frame);
virtual ~GuestViewContainer();
// disable copy
GuestViewContainer(const GuestViewContainer&) = delete;
GuestViewContainer& operator=(const GuestViewContainer&) = delete;
static GuestViewContainer* FromID(int element_instance_id);
void RegisterElementResizeCallback(const ResizeCallback& callback);
@ -36,8 +40,6 @@ class GuestViewContainer {
ResizeCallback element_resize_callback_;
base::WeakPtrFactory<GuestViewContainer> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(GuestViewContainer);
};
} // namespace electron

8
shell/renderer/pepper_helper.h
View file

@ -7,7 +7,6 @@
#include "base/compiler_specific.h"
#include "base/component_export.h"
#include "base/macros.h"
#include "content/public/renderer/render_frame_observer.h"
// This class listens for Pepper creation events from the RenderFrame and
@ -17,12 +16,13 @@ class PepperHelper : public content::RenderFrameObserver {
explicit PepperHelper(content::RenderFrame* render_frame);
~PepperHelper() override;
// disable copy
PepperHelper(const PepperHelper&) = delete;
PepperHelper& operator=(const PepperHelper&) = delete;
// RenderFrameObserver.
void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
void OnDestruct() override;
private:
DISALLOW_COPY_AND_ASSIGN(PepperHelper);
};
#endif // SHELL_RENDERER_PEPPER_HELPER_H_

9
shell/renderer/printing/print_render_frame_helper_delegate.h
View file

@ -5,7 +5,6 @@
#ifndef SHELL_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
#define SHELL_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
#include "base/macros.h"
#include "components/printing/renderer/print_render_frame_helper.h"
namespace electron {
@ -16,13 +15,17 @@ class PrintRenderFrameHelperDelegate
PrintRenderFrameHelperDelegate();
~PrintRenderFrameHelperDelegate() override;
// disable copy
PrintRenderFrameHelperDelegate(const PrintRenderFrameHelperDelegate&) =
delete;
PrintRenderFrameHelperDelegate& operator=(
const PrintRenderFrameHelperDelegate&) = delete;
private:
// printing::PrintRenderFrameHelper::Delegate:
blink::WebElement GetPdfElement(blink::WebLocalFrame* frame) override;
bool IsPrintPreviewEnabled() override;
bool OverridePrint(blink::WebLocalFrame* frame) override;
DISALLOW_COPY_AND_ASSIGN(PrintRenderFrameHelperDelegate);
};
} // namespace electron

7
shell/renderer/web_worker_observer.h
View file

@ -7,7 +7,6 @@
#include <memory>
#include "base/macros.h"
#include "v8/include/v8.h"
namespace electron {
@ -21,6 +20,10 @@ class WebWorkerObserver {
// Returns the WebWorkerObserver for current worker thread.
static WebWorkerObserver* GetCurrent();
// disable copy
WebWorkerObserver(const WebWorkerObserver&) = delete;
WebWorkerObserver& operator=(const WebWorkerObserver&) = delete;
void WorkerScriptReadyForEvaluation(v8::Local<v8::Context> context);
void ContextWillDestroy(v8::Local<v8::Context> context);
@ -30,8 +33,6 @@ class WebWorkerObserver {
std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<ElectronBindings> electron_bindings_;
DISALLOW_COPY_AND_ASSIGN(WebWorkerObserver);
};
} // namespace electron