chrome/common/extensions/features/complex_feature.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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/features/complex_feature.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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/features/complex_feature.h ('k') | chrome/common/extensions/features/complex_feature_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/features/complex_feature.cc

diff --git a/chrome/common/extensions/features/complex_feature.cc b/chrome/common/extensions/features/complex_feature.cc

index b7cc18836700cad3dd091a5f65e9c0f6ee387bfe..c4e5445df0750c3c5ac5bd1655ee2f6befc7a73e 100644

--- a/chrome/common/extensions/features/complex_feature.cc

+++ b/chrome/common/extensions/features/complex_feature.cc

@@ -17,7 +17,7 @@ ComplexFeature::~ComplexFeature() {

}

Feature::Availability ComplexFeature::IsAvailableToManifest(

- const std::string& extension_id, Extension::Type type, Location location,

+ const std::string& extension_id, Manifest::Type type, Location location,

int manifest_version, Platform platform) const {

Feature::Availability first_availability =

features_[0]->IsAvailableToManifest(

@@ -65,7 +65,7 @@ std::set<Feature::Context>* ComplexFeature::GetContexts() {

}

std::string ComplexFeature::GetAvailabilityMessage(AvailabilityResult result,

- Extension::Type type) const {

+ Manifest::Type type) const {

if (result == IS_AVAILABLE)

return "";