chrome/common/extensions/manifest_url_handler.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/manifest_url_handler.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: jyasskin + forward declaring 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/manifest_unittest.cc ('k') | chrome/common/extensions/permissions/permission_set.h » ('j') | extensions/common/install_warning.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_url_handler.cc

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

index c505297d8b8aef63a3ea4f502097bdb6adec7335..3c35e691edd38f3052cb19cfc87faf33b2edde32 100644

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

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

@@ -234,7 +234,7 @@ bool URLOverridesHandler::Parse(const base::Value* value,

#endif

#if defined(FILE_MANAGER_EXTENSION)

is_override = (is_override &&

- !(extension->location() == Extension::COMPONENT &&

+ !(extension->location() == Manifest::COMPONENT &&

page == chrome::kChromeUIFileManagerHost));

#endif

@@ -247,7 +247,7 @@ bool URLOverridesHandler::Parse(const base::Value* value,

// For component extensions, add override URL to extent patterns.

if (extension->is_legacy_packaged_app() &&

- extension->location() == Extension::COMPONENT) {

+ extension->location() == Manifest::COMPONENT) {

URLPattern pattern(URLPattern::SCHEME_CHROMEUI);

std::string url = base::StringPrintf(kOverrideExtentUrlPatternFormat,

page.c_str());