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

6
shell/browser/serial/electron_serial_delegate.h
View file

@ -22,6 +22,10 @@ class ElectronSerialDelegate : public content::SerialDelegate {
ElectronSerialDelegate();
~ElectronSerialDelegate() override;
// disable copy
ElectronSerialDelegate(const ElectronSerialDelegate&) = delete;
ElectronSerialDelegate& operator=(const ElectronSerialDelegate&) = delete;
std::unique_ptr<content::SerialChooser> RunChooser(
content::RenderFrameHost* frame,
std::vector<blink::mojom::SerialPortFilterPtr> filters,
@ -51,8 +55,6 @@ class ElectronSerialDelegate : public content::SerialDelegate {
controller_map_;
base::WeakPtrFactory<ElectronSerialDelegate> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ElectronSerialDelegate);
};
} // namespace electron

6
shell/browser/serial/serial_chooser_context.h
View file

@ -51,6 +51,10 @@ class SerialChooserContext : public KeyedService,
SerialChooserContext();
~SerialChooserContext() override;
// disable copy
SerialChooserContext(const SerialChooserContext&) = delete;
SerialChooserContext& operator=(const SerialChooserContext&) = delete;
// Serial-specific interface for granting and checking permissions.
void GrantPortPermission(const url::Origin& origin,
const device::mojom::SerialPortInfo& port,
@ -89,8 +93,6 @@ class SerialChooserContext : public KeyedService,
base::ObserverList<PortObserver> port_observer_list_;
base::WeakPtrFactory<SerialChooserContext> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(SerialChooserContext);
};
} // namespace electron

8
shell/browser/serial/serial_chooser_context_factory.h
View file

@ -5,7 +5,6 @@
#ifndef SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_
#define SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_
#include "base/macros.h"
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
#include "shell/browser/serial/serial_chooser_context.h"
@ -26,13 +25,16 @@ class SerialChooserContextFactory : public BrowserContextKeyedServiceFactory {
SerialChooserContextFactory();
~SerialChooserContextFactory() override;
// disable copy
SerialChooserContextFactory(const SerialChooserContextFactory&) = delete;
SerialChooserContextFactory& operator=(const SerialChooserContextFactory&) =
delete;
// BrowserContextKeyedServiceFactory methods:
KeyedService* BuildServiceInstanceFor(
content::BrowserContext* context) const override;
content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const override;
DISALLOW_COPY_AND_ASSIGN(SerialChooserContextFactory);
};
} // namespace electron

7
shell/browser/serial/serial_chooser_controller.h
View file

@ -8,7 +8,6 @@
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/global_routing_id.h"
#include "content/public/browser/serial_chooser.h"
@ -40,6 +39,10 @@ class SerialChooserController final : public SerialChooserContext::PortObserver,
base::WeakPtr<ElectronSerialDelegate> serial_delegate);
~SerialChooserController() override;
// disable copy
SerialChooserController(const SerialChooserController&) = delete;
SerialChooserController& operator=(const SerialChooserController&) = delete;
// SerialChooserContext::PortObserver:
void OnPortAdded(const device::mojom::SerialPortInfo& port) override;
void OnPortRemoved(const device::mojom::SerialPortInfo& port) override;
@ -65,8 +68,6 @@ class SerialChooserController final : public SerialChooserContext::PortObserver,
content::GlobalRenderFrameHostId render_frame_host_id_;
base::WeakPtrFactory<SerialChooserController> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(SerialChooserController);
};
} // namespace electron