diff options
| author | elijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 22:28:04 +0000 |
|---|---|---|
| committer | elijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 22:28:04 +0000 |
| commit | 897147a1c17d2277aedc571e6ef518e6f688f646 (patch) | |
| tree | 3e26f0dc4e1ad19541f10a54e504e5d9a2ea554a /chrome/app | |
| parent | 56e365d4ab8426cfef7b23f310815b1ebcb390fd (diff) | |
| download | chromium_src-897147a1c17d2277aedc571e6ef518e6f688f646.zip chromium_src-897147a1c17d2277aedc571e6ef518e6f688f646.tar.gz chromium_src-897147a1c17d2277aedc571e6ef518e6f688f646.tar.bz2 | |
Allow shared modules to whitelist extensions that import them.
BUG=368713
Review URL: https://codereview.chromium.org/263703002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 0ebde23..f02c87c 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4561,6 +4561,9 @@ Make sure you do not expose any sensitive information. <message name="IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_SHARED_MODULE" desc="Error displayed during installation of an extension which tries to imports resources from an extension which is not a shared module."> Unable to import extension with ID "<ph name="IMPORT_ID">$1<ex>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</ex></ph>" because it is not a shared module. </message> + <message name="IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_WHITELISTED" desc="Error displayed during installation of an extension which tries to imports resources from an extension, but it is not whitelisted to do so."> + Unable to import extension with ID "<ph name="IMPORT_ID">$1<ex>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</ex></ph>" because it is not allowed its whitelist. + </message> <message name="IDS_EXTENSION_INSTALL_KIOSK_MODE_ONLY" desc="Error displayed during installation of an app with 'kiosk_only' attribute but user is not in ChromeOS kiosk mode."> App with 'kiosk_only' manifest attribute must be installed in ChromeOS kiosk mode. </message> |