Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4374)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2501913002: Change the NaCl loader and broker processes to use the ServiceManager. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 46e0df995800347283bff89e3fb9f0b3c3aa3ac9..f8ede7fff7a08e01c6d36b1732048e6d6565ffab 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -132,6 +132,7 @@
#include "components/google/core/browser/google_util.h"
#include "components/metrics/call_stack_profile_collector.h"
#include "components/metrics/client_info.h"
+#include "components/nacl/common/nacl_constants.h"
#include "components/net_log/chrome_net_log.h"
#include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
#include "components/payments/payment_request.mojom.h"
@@ -3126,6 +3127,18 @@ ChromeContentBrowserClient::GetServiceManifestOverlay(
return base::JSONReader::Read(manifest_contents);
}
+std::vector<content::ContentBrowserClient::ServiceManifestInfo>
+ChromeContentBrowserClient::GetExtraServiceManifests() {
+ return std::vector<content::ContentBrowserClient::ServiceManifestInfo>({
+#if !defined(DISABLE_NACL)
+ {nacl::kNaClLoaderServiceName, IDR_NACL_LOADER_MANIFEST},
+#if defined(OS_WIN)
+ {nacl::kNaClBrokerServiceName, IDR_NACL_BROKER_MANIFEST},
dcheng 2016/12/19 05:03:25 If this is something clang-format is doing, do you
Sam McNally 2016/12/19 09:36:18 https://bugs.chromium.org/p/chromium/issues/detail
+#endif // defined(OS_WIN)
+#endif // !defined(DISABLE_NACL)
+ });
+}
+
void ChromeContentBrowserClient::OpenURL(
content::BrowserContext* browser_context,
const content::OpenURLParams& params,

Powered by Google App Engine
This is Rietveld 408576698