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

fix: return system shared url loader for content layer

Browse source
This commit is contained in:
deepak1556 2018-11-07 20:08:41 +05:30
parent 57356036db
commit 7e1168c518
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/atom_browser_client.cc
View file

@ -804,6 +804,21 @@ base::FilePath AtomBrowserClient::GetDefaultDownloadDirectory() {
return path; return path;
} }
scoped_refptr<network::SharedURLLoaderFactory>
AtomBrowserClient::GetSystemSharedURLLoaderFactory() {
if (!g_browser_process)
return nullptr;
return g_browser_process->shared_url_loader_factory();
}
void AtomBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {
if (!g_browser_process)
return;
g_browser_process->system_network_context_manager()->OnNetworkServiceCreated(
network_service);
}
std::string AtomBrowserClient::GetApplicationLocale() { std::string AtomBrowserClient::GetApplicationLocale() {
if (BrowserThread::CurrentlyOn(BrowserThread::IO)) if (BrowserThread::CurrentlyOn(BrowserThread::IO))
return g_io_thread_application_locale.Get(); return g_io_thread_application_locale.Get();

4
atom/browser/atom_browser_client.h
View file

@ -144,6 +144,10 @@ class AtomBrowserClient : public content::ContentBrowserClient,
content::BrowserMainParts* CreateBrowserMainParts( content::BrowserMainParts* CreateBrowserMainParts(
const content::MainFunctionParams&) override; const content::MainFunctionParams&) override;
base::FilePath GetDefaultDownloadDirectory() override; base::FilePath GetDefaultDownloadDirectory() override;
scoped_refptr<network::SharedURLLoaderFactory>
GetSystemSharedURLLoaderFactory() override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
// content::RenderProcessHostObserver: // content::RenderProcessHostObserver:
void RenderProcessHostDestroyed(content::RenderProcessHost* host) override; void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;