chrome/common/extensions/manifest.cc - Issue 22470007: Add a "key" entry to InstallWarnings, remove InstallWarning::Format

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

Issue 22470007: Add a "key" entry to InstallWarnings, remove InstallWarning::Format (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ec_infrastructure

Patch Set: Reordered params Created 7 years, 4 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/extension_file_util.cc ('k') | chrome/common/extensions/manifest_handlers/externally_connectable.cc » ('j') | extensions/common/install_warning.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest.cc

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

index 008912a9571b762b0558d6dd67471a0666fb6308..b07abd309d874aacb711a0367239c22831bd5faf 100644

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

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

@@ -157,8 +157,7 @@ bool Manifest::ValidateManifest(

extension_id_, type_, Feature::ConvertLocation(location_),

GetManifestVersion());

if (!result.is_available())

- warnings->push_back(InstallWarning(

- InstallWarning::FORMAT_TEXT, result.message()));

+ warnings->push_back(InstallWarning(result.message(), *feature_name));

}

// Also generate warnings for keys that are not features.

@@ -166,9 +165,9 @@ bool Manifest::ValidateManifest(

it.Advance()) {

if (!provider->GetFeature(it.key())) {

warnings->push_back(InstallWarning(

- InstallWarning::FORMAT_TEXT,

base::StringPrintf("Unrecognized manifest key '%s'.",

- it.key().c_str())));

+ it.key().c_str()),

+ it.key()));

}

return true;