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

Unified Diff: extensions/common/common_manifest_handlers.cc

Issue 435343002: Move NaClModulesHandler to src/extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (nacl-modules) rebase, fix gyp Created 6 years, 4 months 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
« no previous file with comments | « extensions/common/BUILD.gn ('k') | extensions/common/manifest_handlers/nacl_modules_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/common_manifest_handlers.cc
diff --git a/extensions/common/common_manifest_handlers.cc b/extensions/common/common_manifest_handlers.cc
index b2f01e76166a2ad1e6c606f2b9addb8235f01b12..e652fe2d936da624f081fae8627cebc495685b35 100644
--- a/extensions/common/common_manifest_handlers.cc
+++ b/extensions/common/common_manifest_handlers.cc
@@ -11,6 +11,7 @@
#include "extensions/common/manifest_handlers/icons_handler.h"
#include "extensions/common/manifest_handlers/incognito_info.h"
#include "extensions/common/manifest_handlers/kiosk_mode_info.h"
+#include "extensions/common/manifest_handlers/nacl_modules_handler.h"
#include "extensions/common/manifest_handlers/offline_enabled_info.h"
#include "extensions/common/manifest_handlers/sandboxed_page_info.h"
#include "extensions/common/manifest_handlers/shared_module_info.h"
@@ -28,6 +29,9 @@ void RegisterCommonManifestHandlers() {
(new IconsHandler)->Register();
(new IncognitoHandler)->Register();
(new KioskModeHandler)->Register();
+#if !defined(DISABLE_NACL)
+ (new NaClModulesHandler)->Register();
+#endif
(new OfflineEnabledHandler)->Register();
(new SandboxedPageHandler)->Register();
(new SharedModuleHandler)->Register();
« no previous file with comments | « extensions/common/BUILD.gn ('k') | extensions/common/manifest_handlers/nacl_modules_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698