chrome/common/extensions/features/complex_feature.h - 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.h

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

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

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

index e83d1d2f31ad6990ae1c5df3c31d86369c380af0..c776ccf19d6feed26bdfd31b1abf182401313b90 100644

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

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

@@ -10,6 +10,7 @@

#include "base/memory/scoped_vector.h"

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

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

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

namespace extensions {

@@ -27,7 +28,7 @@ class ComplexFeature : public Feature {

// extensions::Feature:

virtual Availability IsAvailableToManifest(const std::string& extension_id,

- Extension::Type type,

+ Manifest::Type type,

Location location,

int manifest_version,

Platform platform) const OVERRIDE;

@@ -40,7 +41,7 @@ class ComplexFeature : public Feature {

// extensions::Feature:

virtual std::string GetAvailabilityMessage(

AvailabilityResult result,

- Extension::Type type) const OVERRIDE;

+ Manifest::Type type) const OVERRIDE;

virtual std::set<Context>* GetContexts() OVERRIDE;