chrome/common/extensions/extension.cc - Issue 11316164: Implement ComplexFeature to support permission features with multiple rules.

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/extension.cc

Issue 11316164: Implement ComplexFeature to support permission features with multiple rules. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: new Created 8 years 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

« chrome/common/extensions/api/extension_api_unittest.cc ('K') | « chrome/common/extensions/api/extension_api_unittest.cc ('k') | chrome/common/extensions/features/complex_feature.h » ('j') | chrome/common/extensions/features/complex_feature.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/extension.cc

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc

index 872ef54e97172f0120bc04c4d97b68bb1be868fb..42c3f66f9ccd1ea91e08a979e7c3aa498df1a7e8 100644

--- a/chrome/common/extensions/extension.cc

+++ b/chrome/common/extensions/extension.cc

@@ -30,8 +30,8 @@

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

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

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

+#include "chrome/common/extensions/features/complex_feature_provider.h"

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

-#include "chrome/common/extensions/features/simple_feature_provider.h"

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

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

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

@@ -735,8 +735,8 @@ bool Extension::ParsePermissions(const char* key,

// Verify feature availability of permissions.

std::vector<APIPermission::ID> to_remove;

- SimpleFeatureProvider* permission_features =

- SimpleFeatureProvider::GetPermissionFeatures();

+ ComplexFeatureProvider* permission_features =

not at google - send to devlin 2012/12/12 17:42:41 FeatureProvider on LHS

justinlin 2012/12/14 12:26:26 Done.

+ ComplexFeatureProvider::GetPermissionFeatures();

for (APIPermissionSet::const_iterator it = api_permissions->begin();

it != api_permissions->end(); ++it) {

extensions::Feature* feature =