extensions/common/common_manifest_handlers.cc - Issue 565423003: Move extensions manifest tests to run in extensions_unittests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/common/common_manifest_handlers.cc

Issue 565423003: Move extensions manifest tests to run in extensions_unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: (manifest2) fix deps, android Created 6 years, 3 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/api/_manifest_features.json ('k') | extensions/common/manifest_handlers/externally_connectable_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 1ce16373c5ee67246a00eaab203906082faa2e68..37330ef9583839674e48b111520e404fafad6908 100644

--- a/extensions/common/common_manifest_handlers.cc

+++ b/extensions/common/common_manifest_handlers.cc

@@ -7,6 +7,7 @@

#include "extensions/common/manifest_handler.h"

#include "extensions/common/manifest_handlers/background_info.h"

#include "extensions/common/manifest_handlers/csp_info.h"

+#include "extensions/common/manifest_handlers/externally_connectable.h"

#include "extensions/common/manifest_handlers/file_handler_info.h"

#include "extensions/common/manifest_handlers/icons_handler.h"

#include "extensions/common/manifest_handlers/incognito_info.h"

@@ -23,9 +24,11 @@ namespace extensions {

void RegisterCommonManifestHandlers() {

DCHECK(!ManifestHandler::IsRegistrationFinalized());

+#if defined(ENABLE_EXTENSIONS)

(new BackgroundManifestHandler)->Register();

(new CSPHandler(false))->Register();

(new CSPHandler(true))->Register();

+ (new ExternallyConnectableHandler)->Register();

(new FileHandlersParser)->Register();

(new IconsHandler)->Register();

(new IncognitoHandler)->Register();

@@ -39,6 +42,7 @@ void RegisterCommonManifestHandlers() {

(new SharedModuleHandler)->Register();

(new WebAccessibleResourcesHandler)->Register();

(new WebviewHandler)->Register();

+#endif // defined(ENABLE_EXTENSIONS)

}

} // namespace extensions