Display the extension id and name when its installation is refused by policy.

BUG=123381
TEST=Try to install a blacklisted extension. The error message and the log detail the extension name and id.


Review URL: http://codereview.chromium.org/10097014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132437 0039d316-1c4b-4281-b951-d872f2087c98
parent b0c12667
...@@ -4335,7 +4335,7 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME ...@@ -4335,7 +4335,7 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME
This extension is blacklisted. This extension is blacklisted.
</message> </message>
<message name="IDS_EXTENSION_CANT_INSTALL_POLICY_BLACKLIST" desc="Error message when a user tries to install an extension that is blacklisted by administrator policy."> <message name="IDS_EXTENSION_CANT_INSTALL_POLICY_BLACKLIST" desc="Error message when a user tries to install an extension that is blacklisted by administrator policy.">
This extension is blacklisted by admin policy. <ph name="EXTENSION_NAME">$1<ex>Google Talk</ex></ph> (extension ID "<ph name="EXTENSION_ID">$2<ex>nckgahadagoaajjgafhacjanaoiihapd</ex></ph>") is blacklisted by the administrator.
</message> </message>
<message name="IDS_EXTENSION_MOVE_DIRECTORY_TO_PROFILE_FAILED" desc=""> <message name="IDS_EXTENSION_MOVE_DIRECTORY_TO_PROFILE_FAILED" desc="">
Could not move extension directory into profile. Could not move extension directory into profile.
......
...@@ -350,8 +350,10 @@ void CrxInstaller::ConfirmInstall() { ...@@ -350,8 +350,10 @@ void CrxInstaller::ConfirmInstall() {
if (!frontend_weak_->extension_prefs()->IsExtensionAllowedByPolicy( if (!frontend_weak_->extension_prefs()->IsExtensionAllowedByPolicy(
extension_->id(), install_source_)) { extension_->id(), install_source_)) {
ReportFailureFromUIThread( ReportFailureFromUIThread(l10n_util::GetStringFUTF16(
l10n_util::GetStringUTF16(IDS_EXTENSION_CANT_INSTALL_POLICY_BLACKLIST)); IDS_EXTENSION_CANT_INSTALL_POLICY_BLACKLIST,
UTF8ToUTF16(extension_->name()),
UTF8ToUTF16(extension_->id())));
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment