chrome/common/extensions/permissions/permissions_data.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/common/extensions/permissions/permissions_data.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/common/extensions/permissions/api_permission_set.cc ('k') | chrome/common/extensions/permissions/permissions_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/permissions_data.cc

diff --git a/chrome/common/extensions/permissions/permissions_data.cc b/chrome/common/extensions/permissions/permissions_data.cc

index 0ef491cfbb0af1ae804b9e1d571269535937eb2d..89ba4209b15c5d9e6eaa7b8897a747e659f5b7e7 100644

--- a/chrome/common/extensions/permissions/permissions_data.cc

+++ b/chrome/common/extensions/permissions/permissions_data.cc

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

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

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

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

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

#include "chrome/common/extensions/permissions/api_permission_set.h"

#include "chrome/common/extensions/permissions/chrome_scheme_hosts.h"

@@ -24,16 +23,17 @@

#include "extensions/common/features/feature.h"

#include "extensions/common/manifest.h"

#include "extensions/common/manifest_constants.h"

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

#include "extensions/common/switches.h"

#include "extensions/common/url_pattern_set.h"

#include "extensions/common/user_script.h"

#include "url/gurl.h"

-namespace keys = extensions::manifest_keys;

-namespace errors = extension_manifest_errors;

namespace extensions {

+namespace keys = manifest_keys;

+namespace errors = manifest_errors;

namespace {

PermissionsData::PolicyDelegate* g_policy_delegate = NULL;