parent
79040e348a
commit
a913e396d5
3 changed files with 7 additions and 5 deletions
|
@ -715,8 +715,8 @@ void AtomBrowserClient::RegisterOutOfProcessServices(
|
|||
#endif
|
||||
}
|
||||
|
||||
std::unique_ptr<base::Value> AtomBrowserClient::GetServiceManifestOverlay(
|
||||
base::StringPiece name) {
|
||||
base::Optional<service_manager::Manifest>
|
||||
AtomBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
|
||||
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
||||
int id = -1;
|
||||
if (name == content::mojom::kBrowserServiceName)
|
||||
|
@ -725,10 +725,11 @@ std::unique_ptr<base::Value> AtomBrowserClient::GetServiceManifestOverlay(
|
|||
id = IDR_ELECTRON_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY;
|
||||
|
||||
if (id == -1)
|
||||
return nullptr;
|
||||
return base::nullopt;
|
||||
|
||||
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() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue