From abae38bb08836ff5dc74b4abb76581577a001e99 Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Tue, 22 Jun 2010 05:20:25 +0000 Subject: Honor @version field when converting greasemonkey scripts to extensions. BUG=30760 Review URL: http://codereview.chromium.org/2829011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50430 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/convert_user_script.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'chrome/browser/extensions/convert_user_script.cc') diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 404f2af..95dab21 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -71,8 +71,14 @@ Extension* ConvertUserScriptToExtension(const FilePath& user_script_path, else root->SetString(keys::kName, original_url.ExtractFileName()); + // Not all scripts have a version, but we need one. Default to 1.0 if it is + // missing. + if (!script.version().empty()) + root->SetString(keys::kVersion, script.version()); + else + root->SetString(keys::kVersion, "1.0"); + root->SetString(keys::kDescription, script.description()); - root->SetString(keys::kVersion, "1.0"); root->SetString(keys::kPublicKey, key); root->SetBoolean(keys::kConvertedFromUserScript, true); -- cgit v1.1