chrome/common/extensions/api/extension_api.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/api/extension_api.cc

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

Patch Set: Review comments, cleanup 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

« no previous file with comments | « chrome/common/extensions/api/_permission_features.json ('k') | chrome/common/extensions/api/extension_api_unittest.cc » ('j') | chrome/common/extensions/features/complex_feature.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/extension_api.cc

diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc

index 0a9766348df2958092fca441eb8149fbd18457ce..c5afac9a9301debd346fa0bdca47641acb3ad20a 100644

--- a/chrome/common/extensions/api/extension_api.cc

+++ b/chrome/common/extensions/api/extension_api.cc

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

#include "base/values.h"

#include "chrome/common/extensions/api/generated_schemas.h"

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

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

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

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

#include "googleurl/src/gurl.h"

@@ -286,7 +287,7 @@ void ExtensionAPI::LoadSchema(const std::string& name,

if (!uses_feature_system)

continue;

- Feature* feature = new Feature();

+ SimpleFeature* feature = new SimpleFeature();

feature->set_name(schema_namespace);

feature->Parse(schema);

@@ -307,7 +308,7 @@ void ExtensionAPI::LoadSchema(const std::string& name,

DictionaryValue* child = NULL;

CHECK(child_list->GetDictionary(j, &child));

- scoped_ptr<Feature> child_feature(new Feature(*feature));

+ scoped_ptr<SimpleFeature> child_feature(new SimpleFeature(*feature));

child_feature->Parse(child);

if (child_feature->Equals(*feature))

continue; // no need to store no-op features