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

chore: use c++ manifests instead of json

Browse source
This commit is contained in:
Heilig Benedek 2019-02-04 16:54:55 +01:00 • committed by deepak1556
parent cece8bce0b
commit d7557cb66a
8 changed files with 93 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

21
atom/browser/atom_browser_client.cc
View file

@ -11,6 +11,7 @@
#include <memory>
#include <utility>
#include "atom/app/manifests.h"
#include "atom/browser/api/atom_api_app.h"
#include "atom/browser/api/atom_api_protocol.h"
#include "atom/browser/api/atom_api_web_contents.h"
@ -716,19 +717,15 @@ void AtomBrowserClient::RegisterOutOfProcessServices(
base::Optional<service_manager::Manifest>
AtomBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
int id = -1;
if (name == content::mojom::kBrowserServiceName)
id = IDR_ELECTRON_CONTENT_BROWSER_MANIFEST_OVERLAY;
else if (name == content::mojom::kPackagedServicesServiceName)
id = IDR_ELECTRON_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY;
if (name == content::mojom::kBrowserServiceName) {
return GetElectronContentBrowserOverlayManifest();
} else if (name == content::mojom::kPackagedServicesServiceName) {
service_manager::Manifest overlay;
overlay.packaged_services = GetElectronPackagedServicesOverlayManifest();
return overlay;
}
if (id == -1)
return base::nullopt;
base::StringPiece manifest_contents = rb.GetRawDataResource(id);
return service_manager::Manifest::FromValueDeprecated(
base::JSONReader::Read(manifest_contents));
return base::nullopt;
}
net::NetLog* AtomBrowserClient::GetNetLog() {