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

17
shell/browser/net/proxying_url_loader_factory.h
View file

@ -12,7 +12,6 @@
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/render_frame_host.h"
@ -69,6 +68,10 @@ class ProxyingURLLoaderFactory
const network::ResourceRequest& request);
~InProgressRequest() override;
// disable copy
InProgressRequest(const InProgressRequest&) = delete;
InProgressRequest& operator=(const InProgressRequest&) = delete;
void Restart();
// network::mojom::URLLoader:
@ -175,13 +178,13 @@ class ProxyingURLLoaderFactory
net::HttpRequestHeaders modified_cors_exempt_headers;
absl::optional<GURL> new_url;
DISALLOW_COPY_AND_ASSIGN(FollowRedirectParams);
// disable copy
FollowRedirectParams(const FollowRedirectParams&) = delete;
FollowRedirectParams& operator=(const FollowRedirectParams&) = delete;
};
std::unique_ptr<FollowRedirectParams> pending_follow_redirect_params_;
base::WeakPtrFactory<InProgressRequest> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(InProgressRequest);
};
ProxyingURLLoaderFactory(
@ -202,6 +205,10 @@ class ProxyingURLLoaderFactory
~ProxyingURLLoaderFactory() override;
// disable copy
ProxyingURLLoaderFactory(const ProxyingURLLoaderFactory&) = delete;
ProxyingURLLoaderFactory& operator=(const ProxyingURLLoaderFactory&) = delete;
// network::mojom::URLLoaderFactory:
void CreateLoaderAndStart(
mojo::PendingReceiver<network::mojom::URLLoader> loader,
@ -270,8 +277,6 @@ class ProxyingURLLoaderFactory
std::map<int32_t, uint64_t> network_request_id_to_web_request_id_;
std::vector<std::string> ignore_connections_limit_domains_;
DISALLOW_COPY_AND_ASSIGN(ProxyingURLLoaderFactory);
};
} // namespace electron