mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: rename atom -> electron (#21986)

Browse source
This commit is contained in:
Jeremy Apthorp 2020-02-04 12:19:40 -08:00 • committed by GitHub
parent f14fc4b041
commit d9321f4df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
287 changed files with 1771 additions and 1708 deletions
Download patch file Download diff file Expand all files Collapse all files

42
shell/browser/net/atom_url_loader_factory.cc → shell/browser/net/electron_url_loader_factory.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "shell/browser/net/atom_url_loader_factory.h"
#include "shell/browser/net/electron_url_loader_factory.h"
#include <memory>
#include <string>
@ -18,12 +18,12 @@
#include "net/http/http_status_code.h"
#include "services/network/public/cpp/url_loader_completion_status.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "shell/browser/api/atom_api_session.h"
#include "shell/browser/atom_browser_context.h"
#include "shell/browser/api/electron_api_session.h"
#include "shell/browser/electron_browser_context.h"
#include "shell/browser/net/asar/asar_url_loader.h"
#include "shell/browser/net/node_stream_loader.h"
#include "shell/browser/net/url_pipe_loader.h"
#include "shell/common/atom_constants.h"
#include "shell/common/electron_constants.h"
#include "shell/common/gin_converters/file_path_converter.h"
#include "shell/common/gin_converters/gurl_converter.h"
#include "shell/common/gin_converters/net_converter.h"
@ -161,13 +161,14 @@ void OnWrite(std::unique_ptr<WriteData> write_data, MojoResult result) {
} // namespace
AtomURLLoaderFactory::AtomURLLoaderFactory(ProtocolType type,
const ProtocolHandler& handler)
ElectronURLLoaderFactory::ElectronURLLoaderFactory(
ProtocolType type,
const ProtocolHandler& handler)
: type_(type), handler_(handler) {}
AtomURLLoaderFactory::~AtomURLLoaderFactory() = default;
ElectronURLLoaderFactory::~ElectronURLLoaderFactory() = default;
void AtomURLLoaderFactory::CreateLoaderAndStart(
void ElectronURLLoaderFactory::CreateLoaderAndStart(
mojo::PendingReceiver<network::mojom::URLLoader> loader,
int32_t routing_id,
int32_t request_id,
@ -178,18 +179,18 @@ void AtomURLLoaderFactory::CreateLoaderAndStart(
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
handler_.Run(
request,
base::BindOnce(&AtomURLLoaderFactory::StartLoading, std::move(loader),
base::BindOnce(&ElectronURLLoaderFactory::StartLoading, std::move(loader),
routing_id, request_id, options, request,
std::move(client), traffic_annotation, nullptr, type_));
}
void AtomURLLoaderFactory::Clone(
void ElectronURLLoaderFactory::Clone(
mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver) {
receivers_.Add(this, std::move(receiver));
}
// static
void AtomURLLoaderFactory::StartLoading(
void ElectronURLLoaderFactory::StartLoading(
mojo::PendingReceiver<network::mojom::URLLoader> loader,
int32_t routing_id,
int32_t request_id,
@ -308,7 +309,7 @@ void AtomURLLoaderFactory::StartLoading(
}
// static
void AtomURLLoaderFactory::StartLoadingBuffer(
void ElectronURLLoaderFactory::StartLoadingBuffer(
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
network::mojom::URLResponseHeadPtr head,
const gin_helper::Dictionary& dict) {
@ -328,7 +329,7 @@ void AtomURLLoaderFactory::StartLoadingBuffer(
}
// static
void AtomURLLoaderFactory::StartLoadingString(
void ElectronURLLoaderFactory::StartLoadingString(
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
network::mojom::URLResponseHeadPtr head,
const gin_helper::Dictionary& dict,
@ -351,7 +352,7 @@ void AtomURLLoaderFactory::StartLoadingString(
}
// static
void AtomURLLoaderFactory::StartLoadingFile(
void ElectronURLLoaderFactory::StartLoadingFile(
mojo::PendingReceiver<network::mojom::URLLoader> loader,
network::ResourceRequest request,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
@ -381,7 +382,7 @@ void AtomURLLoaderFactory::StartLoadingFile(
}
// static
void AtomURLLoaderFactory::StartLoadingHttp(
void ElectronURLLoaderFactory::StartLoadingHttp(
mojo::PendingReceiver<network::mojom::URLLoader> loader,
const network::ResourceRequest& original_request,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
@ -400,12 +401,13 @@ void AtomURLLoaderFactory::StartLoadingHttp(
if (request->method != "GET" && request->method != "HEAD")
dict.Get("uploadData", &upload_data);
scoped_refptr<AtomBrowserContext> browser_context =
AtomBrowserContext::From("", false);
scoped_refptr<ElectronBrowserContext> browser_context =
ElectronBrowserContext::From("", false);
v8::Local<v8::Value> value;
if (dict.Get("session", &value)) {
if (value->IsNull()) {
browser_context = AtomBrowserContext::From(base::GenerateGUID(), true);
browser_context =
ElectronBrowserContext::From(base::GenerateGUID(), true);
} else {
gin::Handle<api::Session> session;
if (gin::ConvertFromV8(dict.isolate(), value, &session) &&
@ -423,7 +425,7 @@ void AtomURLLoaderFactory::StartLoadingHttp(
}
// static
void AtomURLLoaderFactory::StartLoadingStream(
void ElectronURLLoaderFactory::StartLoadingStream(
mojo::PendingReceiver<network::mojom::URLLoader> loader,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
network::mojom::URLResponseHeadPtr head,
@ -476,7 +478,7 @@ void AtomURLLoaderFactory::StartLoadingStream(
}
// static
void AtomURLLoaderFactory::SendContents(
void ElectronURLLoaderFactory::SendContents(
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
network::mojom::URLResponseHeadPtr head,
std::string data) {

14
shell/browser/net/atom_url_loader_factory.h → shell/browser/net/electron_url_loader_factory.h
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#ifndef SHELL_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
#define SHELL_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
#ifndef SHELL_BROWSER_NET_ELECTRON_URL_LOADER_FACTORY_H_
#define SHELL_BROWSER_NET_ELECTRON_URL_LOADER_FACTORY_H_
#include <map>
#include <string>
@ -39,10 +39,10 @@ using HandlersMap =
std::map<std::string, std::pair<ProtocolType, ProtocolHandler>>;
// Implementation of URLLoaderFactory.
class AtomURLLoaderFactory : public network::mojom::URLLoaderFactory {
class ElectronURLLoaderFactory : public network::mojom::URLLoaderFactory {
public:
AtomURLLoaderFactory(ProtocolType type, const ProtocolHandler& handler);
~AtomURLLoaderFactory() override;
ElectronURLLoaderFactory(ProtocolType type, const ProtocolHandler& handler);
~ElectronURLLoaderFactory() override;
// network::mojom::URLLoaderFactory:
void CreateLoaderAndStart(
@ -114,9 +114,9 @@ class AtomURLLoaderFactory : public network::mojom::URLLoaderFactory {
ProtocolType type_;
ProtocolHandler handler_;
DISALLOW_COPY_AND_ASSIGN(AtomURLLoaderFactory);
DISALLOW_COPY_AND_ASSIGN(ElectronURLLoaderFactory);
};
} // namespace electron
#endif // SHELL_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
#endif // SHELL_BROWSER_NET_ELECTRON_URL_LOADER_FACTORY_H_

6
shell/browser/net/network_context_service.cc
View file

@ -7,14 +7,14 @@
#include "chrome/common/chrome_constants.h"
#include "content/public/browser/network_service_instance.h"
#include "services/network/network_service.h"
#include "shell/browser/atom_browser_client.h"
#include "shell/browser/browser_process_impl.h"
#include "shell/browser/electron_browser_client.h"
#include "shell/browser/net/system_network_context_manager.h"
namespace electron {
NetworkContextService::NetworkContextService(content::BrowserContext* context)
: browser_context_(static_cast<AtomBrowserContext*>(context)),
: browser_context_(static_cast<ElectronBrowserContext*>(context)),
proxy_config_monitor_(browser_context_->prefs()) {}
NetworkContextService::~NetworkContextService() = default;
@ -42,7 +42,7 @@ NetworkContextService::CreateNetworkContextParams(bool in_memory,
network_context_params->accept_language =
net::HttpUtil::GenerateAcceptLanguageHeader(
AtomBrowserClient::Get()->GetApplicationLocale());
ElectronBrowserClient::Get()->GetApplicationLocale());
// Enable the HTTP cache.
network_context_params->http_cache_enabled =

4
shell/browser/net/network_context_service.h
View file

@ -10,7 +10,7 @@
#include "components/keyed_service/core/keyed_service.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "shell/browser/atom_browser_context.h"
#include "shell/browser/electron_browser_context.h"
namespace electron {
@ -33,7 +33,7 @@ class NetworkContextService : public KeyedService {
bool in_memory,
const base::FilePath& path);
AtomBrowserContext* browser_context_;
ElectronBrowserContext* browser_context_;
ProxyConfigMonitor proxy_config_monitor_;
};

3
shell/browser/net/network_context_service_factory.cc
View file

@ -28,7 +28,8 @@ NetworkContextServiceFactory::~NetworkContextServiceFactory() = default;
KeyedService* NetworkContextServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
return new NetworkContextService(static_cast<AtomBrowserContext*>(context));
return new NetworkContextService(
static_cast<ElectronBrowserContext*>(context));
}
content::BrowserContext* NetworkContextServiceFactory::GetBrowserContextToUse(

2
shell/browser/net/proxying_url_loader_factory.cc
View file

@ -739,7 +739,7 @@ void ProxyingURLLoaderFactory::CreateLoaderAndStart(
if (it != intercepted_handlers_.end()) {
// <scheme, <type, handler>>
it->second.second.Run(
request, base::BindOnce(&AtomURLLoaderFactory::StartLoading,
request, base::BindOnce(&ElectronURLLoaderFactory::StartLoading,
std::move(loader), routing_id, request_id,
options, request, std::move(client),
traffic_annotation, this, it->second.first));

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

@ -23,7 +23,7 @@
#include "services/network/public/mojom/network_context.mojom.h"
#include "services/network/public/mojom/url_loader.mojom.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
#include "shell/browser/net/atom_url_loader_factory.h"
#include "shell/browser/net/electron_url_loader_factory.h"
namespace electron {

4
shell/browser/net/resolve_proxy_helper.cc
View file

@ -12,13 +12,13 @@
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "net/proxy_resolution/proxy_info.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "shell/browser/atom_browser_context.h"
#include "shell/browser/electron_browser_context.h"
using content::BrowserThread;
namespace electron {
ResolveProxyHelper::ResolveProxyHelper(AtomBrowserContext* browser_context)
ResolveProxyHelper::ResolveProxyHelper(ElectronBrowserContext* browser_context)
: browser_context_(browser_context) {}
ResolveProxyHelper::~ResolveProxyHelper() {

6
shell/browser/net/resolve_proxy_helper.h
View file

@ -16,7 +16,7 @@
namespace electron {
class AtomBrowserContext;
class ElectronBrowserContext;
class ResolveProxyHelper
: public base::RefCountedThreadSafe<ResolveProxyHelper>,
@ -24,7 +24,7 @@ class ResolveProxyHelper
public:
using ResolveProxyCallback = base::OnceCallback<void(std::string)>;
explicit ResolveProxyHelper(AtomBrowserContext* browser_context);
explicit ResolveProxyHelper(ElectronBrowserContext* browser_context);
void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
@ -65,7 +65,7 @@ class ResolveProxyHelper
mojo::Receiver<network::mojom::ProxyLookupClient> receiver_{this};
// Weak Ref
AtomBrowserContext* browser_context_;
ElectronBrowserContext* browser_context_;
DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
};

4
shell/browser/net/system_network_context_manager.cc
View file

@ -21,7 +21,7 @@
#include "services/network/public/cpp/cross_thread_pending_shared_url_loader_factory.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "shell/browser/atom_browser_client.h"
#include "shell/browser/electron_browser_client.h"
#include "shell/common/application_info.h"
#include "shell/common/options_switches.h"
#include "url/gurl.h"
@ -220,7 +220,7 @@ SystemNetworkContextManager::CreateNetworkContextParams() {
network_context_params->context_name = std::string("system");
network_context_params->user_agent =
electron::AtomBrowserClient::Get()->GetUserAgent();
electron::ElectronBrowserClient::Get()->GetUserAgent();
network_context_params->http_cache_enabled = false;