chrome/browser/extensions/extension_service.cc - Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/

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: chrome/browser/extensions/extension_service.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 7 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 | « chrome/browser/extensions/extension_protocols_unittest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc

index c6dd2e09d8eca4bbaf17fe979e09ba41fef8c69e..838d2f9349bd0f013e5bf118ee7968d1d0437072 100644

--- a/chrome/browser/extensions/extension_service.cc

+++ b/chrome/browser/extensions/extension_service.cc

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

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_file_util.h"

-#include "chrome/common/extensions/extension_manifest_constants.h"

#include "chrome/common/extensions/extension_messages.h"

#include "chrome/common/extensions/feature_switch.h"

#include "chrome/common/extensions/features/feature_channel.h"

@@ -97,6 +96,7 @@

#include "extensions/common/constants.h"

#include "extensions/common/error_utils.h"

#include "extensions/common/manifest.h"

+#include "extensions/common/manifest_constants.h"

#include "grit/generated_resources.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

#include "sync/api/sync_change.h"

@@ -127,7 +127,7 @@ using extensions::PermissionSet;

using extensions::SharedModuleInfo;

using extensions::UnloadedExtensionInfo;

-namespace errors = extension_manifest_errors;

+namespace errors = extensions::manifest_errors;

namespace {