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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « extensions/common/BUILD.gn ('k') | extensions/common/manifest_handlers/nacl_modules_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/common/common_manifest_handlers.h" 5 #include "extensions/common/common_manifest_handlers.h"
6 6
7 #include "extensions/common/manifest_handler.h" 7 #include "extensions/common/manifest_handler.h"
8 #include "extensions/common/manifest_handlers/background_info.h" 8 #include "extensions/common/manifest_handlers/background_info.h"
9 #include "extensions/common/manifest_handlers/csp_info.h" 9 #include "extensions/common/manifest_handlers/csp_info.h"
10 #include "extensions/common/manifest_handlers/file_handler_info.h" 10 #include "extensions/common/manifest_handlers/file_handler_info.h"
11 #include "extensions/common/manifest_handlers/icons_handler.h" 11 #include "extensions/common/manifest_handlers/icons_handler.h"
12 #include "extensions/common/manifest_handlers/incognito_info.h" 12 #include "extensions/common/manifest_handlers/incognito_info.h"
13 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" 13 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
14 #include "extensions/common/manifest_handlers/nacl_modules_handler.h"
14 #include "extensions/common/manifest_handlers/offline_enabled_info.h" 15 #include "extensions/common/manifest_handlers/offline_enabled_info.h"
15 #include "extensions/common/manifest_handlers/sandboxed_page_info.h" 16 #include "extensions/common/manifest_handlers/sandboxed_page_info.h"
16 #include "extensions/common/manifest_handlers/shared_module_info.h" 17 #include "extensions/common/manifest_handlers/shared_module_info.h"
17 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h" 18 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
18 #include "extensions/common/manifest_handlers/webview_info.h" 19 #include "extensions/common/manifest_handlers/webview_info.h"
19 20
20 namespace extensions { 21 namespace extensions {
21 22
22 void RegisterCommonManifestHandlers() { 23 void RegisterCommonManifestHandlers() {
23 DCHECK(!ManifestHandler::IsRegistrationFinalized()); 24 DCHECK(!ManifestHandler::IsRegistrationFinalized());
24 (new BackgroundManifestHandler)->Register(); 25 (new BackgroundManifestHandler)->Register();
25 (new CSPHandler(false))->Register(); 26 (new CSPHandler(false))->Register();
26 (new CSPHandler(true))->Register(); 27 (new CSPHandler(true))->Register();
27 (new FileHandlersParser)->Register(); 28 (new FileHandlersParser)->Register();
28 (new IconsHandler)->Register(); 29 (new IconsHandler)->Register();
29 (new IncognitoHandler)->Register(); 30 (new IncognitoHandler)->Register();
30 (new KioskModeHandler)->Register(); 31 (new KioskModeHandler)->Register();
32 #if !defined(DISABLE_NACL)
33 (new NaClModulesHandler)->Register();
34 #endif
31 (new OfflineEnabledHandler)->Register(); 35 (new OfflineEnabledHandler)->Register();
32 (new SandboxedPageHandler)->Register(); 36 (new SandboxedPageHandler)->Register();
33 (new SharedModuleHandler)->Register(); 37 (new SharedModuleHandler)->Register();
34 (new WebAccessibleResourcesHandler)->Register(); 38 (new WebAccessibleResourcesHandler)->Register();
35 (new WebviewHandler)->Register(); 39 (new WebviewHandler)->Register();
36 } 40 }
37 41
38 } // namespace extensions 42 } // namespace extensions
OLDNEW
« 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