chore: use c++ manifests instead of json

electron · Feb 4, 2019 · d7557cb66ab94c66b0f3bf14644bd728e3594148 · d7557cb
1 parent cece8bc
commit d7557cb66ab94c66b0f3bf14644bd728e3594148
diff --git a/BUILD.gn b/BUILD.gn
@@ -2,7 +2,6 @@ import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
 import("//pdf/features.gni")
-  
-import("//services/service_manager/public/service_manifest.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
 import("//tools/generate_library_loader/generate_library_loader.gni")
 import("//tools/grit/grit_rule.gni")
@@ -281,7 +280,6 @@ grit("resources") {
  deps = [
    ":copy_shell_devtools_discovery_page",
-  
-    ":electron_content_manifest_overlays",
  ]
  output_dir = "$target_gen_dir"
@@ -330,6 +328,7 @@ static_library("electron_lib") {
    ":atom_js2c",
    "buildflags",
    "chromium_src:chrome",
+  
+    "manifests",
    "native_mate",
    "//base",
    "//base:base_static",
@@ -1055,26 +1054,3 @@ group("electron") {
    ":electron_app",
  ]
 }
-  
-
-  
-group("electron_content_manifest_overlays") {
-  
-  deps = [
-  
-    ":electron_content_browser_manifest_overlay",
-  
-    ":electron_content_packaged_services_manifest_overlay",
-  
-  ]
-  
-}
-  
-
-  
-service_manifest("electron_content_packaged_services_manifest_overlay") {
-  
-  source = "//electron/manifests/electron_content_packaged_services_manifest_overlay.json"
-  
-  packaged_services = [ "//services/proxy_resolver:proxy_resolver_manifest" ]
-  
-
-  
-  if (enable_basic_printing) {
-  
-    packaged_services += [
-  
-      "//chrome/services/printing:manifest",
-  
-      "//components/services/pdf_compositor:pdf_compositor_manifest",
-  
-    ]
-  
-  }
-  
-}
-  
-
-  
-service_manifest("electron_content_browser_manifest_overlay") {
-  
-  source = "//electron/manifests/electron_content_browser_manifest_overlay.json"
-  
-}
diff --git a/atom/app/manifests.cc b/atom/app/manifests.cc
@@ -0,0 +1,44 @@
+  
+// Copyright (c) 2019 GitHub, Inc.
+  
+// Use of this source code is governed by the MIT license that can be
+  
+// found in the LICENSE file.
+  
+
+  
+#include "atom/app/manifests.h"
+  
+
+  
+#include "base/no_destructor.h"
+  
+#include "printing/buildflags/buildflags.h"
+  
+#include "services/proxy_resolver/proxy_resolver_manifest.h"
+  
+#include "services/service_manager/public/cpp/manifest_builder.h"
+  
+
+  
+#if BUILDFLAG(ENABLE_PRINTING)
+  
+#include "components/services/pdf_compositor/pdf_compositor_manifest.h"
+  
+#endif
+  
+
+  
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+  
+#include "chrome/services/printing/manifest.h"
+  
+#endif
+  
+
+  
+const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
+  
+  static base::NoDestructor<service_manager::Manifest> manifest{
+  
+      service_manager::ManifestBuilder()
+  
+          .WithDisplayName("Electron (browser process)")
+  
+          .RequireCapability("device", "device:geolocation_control")
+  
+          .RequireCapability("proxy_resolver", "factory")
+  
+          .RequireCapability("chrome_printing", "converter")
+  
+          .RequireCapability("pdf_compositor", "compositor")
+  
+          .Build()};
+  
+  return *manifest;
+  
+}
+  
+
+  
+const std::vector<service_manager::Manifest>&
+  
+GetElectronPackagedServicesOverlayManifest() {
+  
+  static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
+  
+      proxy_resolver::GetManifest(),
+  
+#if BUILDFLAG(ENABLE_PRINTING)
+  
+      pdf_compositor::GetManifest(),
+  
+#endif
+  
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+  
+      chrome_printing::GetManifest(),
+  
+#endif
+  
+  }};
+  
+  return *manifests;
+  
+}
diff --git a/atom/app/manifests.h b/atom/app/manifests.h
@@ -0,0 +1,16 @@
+  
+// Copyright (c) 2019 GitHub, Inc.
+  
+// Use of this source code is governed by the MIT license that can be
+  
+// found in the LICENSE file.
+  
+
+  
+#ifndef ATOM_APP_MANIFESTS_H_
+  
+#define ATOM_APP_MANIFESTS_H_
+  
+
+  
+#include <vector>
+  
+
+  
+#include "services/service_manager/public/cpp/manifest.h"
+  
+
+  
+const service_manager::Manifest& GetElectronContentBrowserOverlayManifest();
+  
+const std::vector<service_manager::Manifest>&
+  
+GetElectronPackagedServicesOverlayManifest();
+  
+
+  
+#endif  // ATOM_APP_MANIFESTS_H_
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
@@ -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 (id == -1)
-  
-    return base::nullopt;
-  
-
-  
-  base::StringPiece manifest_contents = rb.GetRawDataResource(id);
-  
-  return service_manager::Manifest::FromValueDeprecated(
-  
-      base::JSONReader::Read(manifest_contents));
+  
+  if (name == content::mojom::kBrowserServiceName) {
+  
+    return GetElectronContentBrowserOverlayManifest();
+  
+  } else if (name == content::mojom::kPackagedServicesServiceName) {
+  
+    service_manager::Manifest overlay;
+  
+    overlay.packaged_services = GetElectronPackagedServicesOverlayManifest();
+  
+    return overlay;
+  
+  }
+  
+
+  
+  return base::nullopt;
 }
 net::NetLog* AtomBrowserClient::GetNetLog() {

diff --git a/electron_resources.grd b/electron_resources.grd
@@ -17,8 +17,6 @@
      <part file="electron_strings.grdp" />
    </messages>
    <includes>
-  
-      <include name="IDR_ELECTRON_CONTENT_BROWSER_MANIFEST_OVERLAY" file="${target_gen_dir}\electron_content_browser_manifest_overlay.json" use_base_dir="false" type="BINDATA" />
-  
-      <include name="IDR_ELECTRON_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY" file="${target_gen_dir}\electron_content_packaged_services_manifest_overlay.json" use_base_dir="false" type="BINDATA" />
      <include name="IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE" file="${target_gen_dir}\shell_devtools_discovery_page.html" use_base_dir="false" type="BINDATA" />
    </includes>
  </release>

diff --git a/manifests/BUILD.gn b/manifests/BUILD.gn
@@ -0,0 +1,23 @@
+  
+import("//printing/buildflags/buildflags.gni")
+  
+
+  
+source_set("manifests") {
+  
+  sources = [
+  
+    "//electron/atom/app/manifests.cc",
+  
+    "//electron/atom/app/manifests.h",
+  
+  ]
+  
+
+  
+  include_dirs = [ "//electron" ]
+  
+
+  
+  deps = [
+  
+    "//printing/buildflags",
+  
+    "//services/proxy_resolver:proxy_resolver_manifest",
+  
+  ]
+  
+
+  
+  if (enable_basic_printing) {
+  
+    deps += [ "//components/services/pdf_compositor:pdf_compositor_manifest" ]
+  
+  }
+  
+
+  
+  if (enable_print_preview) {
+  
+    deps += [ "//chrome/services/printing:manifest" ]
+  
+  }
+  
+}
diff --git a/manifests/electron_content_browser_manifest_overlay.json b/manifests/electron_content_browser_manifest_overlay.json
diff --git a/manifests/electron_content_packaged_services_manifest_overlay.json b/manifests/electron_content_packaged_services_manifest_overlay.json