diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 20:40:07 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 20:40:07 +0000 |
| commit | b90f343fd1e70f1695231a43faaa75c8bab4eb41 (patch) | |
| tree | 7164d1f3fe4ba240cfc62becd5ff627e09e5f759 /extensions/common/common_manifest_handlers.cc | |
| parent | 62c928aeee529832bc1185489ae0bc01e017cf0f (diff) | |
| download | chromium_src-b90f343fd1e70f1695231a43faaa75c8bab4eb41.zip chromium_src-b90f343fd1e70f1695231a43faaa75c8bab4eb41.tar.gz chromium_src-b90f343fd1e70f1695231a43faaa75c8bab4eb41.tar.bz2 | |
Move NaClModulesHandler to src/extensions
This is a first, very small step towards making NaCl work in app_shell.
BUG=400577
TEST=compiles
TBR=brettw@chromium.org for moving a few lines out of chrome/common/BUILD.gn into extensions/common/BUILD.gn
Review URL: https://codereview.chromium.org/435343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/common/common_manifest_handlers.cc')
| -rw-r--r-- | extensions/common/common_manifest_handlers.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extensions/common/common_manifest_handlers.cc b/extensions/common/common_manifest_handlers.cc index b2f01e7..e652fe2 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(); |