summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 13:44:20 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 13:44:20 +0000
commit0f57d2f28d222f8160101f72228575666b22993e (patch)
treed1081c1268262350a38966c3f26e26c7a725de5c /chrome/app
parent3693df59ae0e5b86ff59f24061e4937b16efe80a (diff)
downloadchromium_src-0f57d2f28d222f8160101f72228575666b22993e.zip
chromium_src-0f57d2f28d222f8160101f72228575666b22993e.tar.gz
chromium_src-0f57d2f28d222f8160101f72228575666b22993e.tar.bz2
Fix a crash in the Extension Creator when crx is in use.
BUG=92537 TEST=Create a .crx file from within Chrome, open it up with 7-zip and edit one of the files within (to lock the crx file), then try recreating the crx file -- an error should appear (and no crash). Review URL: http://codereview.chromium.org/7618044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9f3b36f..d028b65 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3801,6 +3801,9 @@ are declared in build/common.gypi.
<message name="IDS_EXTENSION_ERROR_WHILE_SIGNING" desc="Warning displayed in pack dialog when occurred an error while signing an extension.">
Error while signing extension.
</message>
+ <message name="IDS_EXTENSION_SHARING_VIOLATION" desc="Warning displayed in pack dialog when a sharing violation is found during creation of the crx.">
+ Failed to replace crx file. Check to see if the file is in use.
+ </message>
<message name="IDS_EXTENSION_PUBLIC_KEY_FAILED_TO_EXPORT" desc="Warning displayed in pack dialog when exporting a public key failed.">
Failed to export public key.
</message>