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

[SM] Use C++ Manifests for SM embedders

Browse source 
1383530
This commit is contained in:
deepak1556 2019-01-21 23:50:22 +05:30
parent 79040e348a
commit a913e396d5
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/atom_browser_client.cc
View file

@ -715,8 +715,8 @@ void AtomBrowserClient::RegisterOutOfProcessServices(
#endif #endif
} }
std::unique_ptr<base::Value> AtomBrowserClient::GetServiceManifestOverlay( base::Optional<service_manager::Manifest>
base::StringPiece name) { AtomBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
int id = -1; int id = -1;
if (name == content::mojom::kBrowserServiceName) if (name == content::mojom::kBrowserServiceName)
@ -725,10 +725,11 @@ std::unique_ptr<base::Value> AtomBrowserClient::GetServiceManifestOverlay(
id = IDR_ELECTRON_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY; id = IDR_ELECTRON_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY;
if (id == -1) if (id == -1)
return nullptr; return base::nullopt;
base::StringPiece manifest_contents = rb.GetRawDataResource(id); base::StringPiece manifest_contents = rb.GetRawDataResource(id);
return base::JSONReader::Read(manifest_contents); return service_manager::Manifest::FromValueDeprecated(
base::JSONReader::Read(manifest_contents));
} }
net::NetLog* AtomBrowserClient::GetNetLog() { net::NetLog* AtomBrowserClient::GetNetLog() {

2
atom/browser/atom_browser_client.h
View file

@ -138,7 +138,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path) override; const base::FilePath& relative_partition_path) override;
void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override; void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
std::unique_ptr<base::Value> GetServiceManifestOverlay( base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
base::StringPiece name) override; base::StringPiece name) override;
net::NetLog* GetNetLog() override; net::NetLog* GetNetLog() override;
content::MediaObserver* GetMediaObserver() override; content::MediaObserver* GetMediaObserver() override;

1
atom/utility/atom_content_utility_client.cc
View file

@ -10,6 +10,7 @@
#include "content/public/child/child_thread.h" #include "content/public/child/child_thread.h"
#include "content/public/common/service_manager_connection.h" #include "content/public/common/service_manager_connection.h"
#include "content/public/common/simple_connection_filter.h" #include "content/public/common/simple_connection_filter.h"
#include "content/public/utility/utility_thread.h"
#include "services/proxy_resolver/proxy_resolver_service.h" #include "services/proxy_resolver/proxy_resolver_service.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h" #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "services/service_manager/sandbox/switches.h" #include "services/service_manager/sandbox/switches.h"