diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-05 13:11:37 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-05 13:11:37 +0000 |
| commit | e1e2da3479979769535e1025bcfe22f973cb2b5e (patch) | |
| tree | cfd8e19ec8acc3cd02600fb15a4cd5753d9678ea /chrome/browser/ui | |
| parent | 9686f81c6e638ddcab2d3f0af1ff0c38b0a6f4e4 (diff) | |
| download | chromium_src-e1e2da3479979769535e1025bcfe22f973cb2b5e.zip chromium_src-e1e2da3479979769535e1025bcfe22f973cb2b5e.tar.gz chromium_src-e1e2da3479979769535e1025bcfe22f973cb2b5e.tar.bz2 | |
Add a note to chrome://extensions to explain when an extension has been disabled due to corruption.
BUG=369466
R=asargent@chromium.org, bauerb@chromium.org
Review URL: https://codereview.chromium.org/265563004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/extensions/extension_settings_handler.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index d7788af..da10080 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -213,12 +213,16 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue( if (suspicious_install) should_do_verification_check_ = true; + bool corrupt_install = + (disable_reasons & Extension::DISABLE_CORRUPTED) != 0; + extension_data->SetBoolean("corruptInstall", corrupt_install); + bool managed_install = !management_policy_->UserMayModifySettings(extension, NULL); extension_data->SetBoolean("managedInstall", managed_install); // We should not get into a state where both are true. - DCHECK(managed_install == false || suspicious_install == false); + DCHECK(!managed_install || !suspicious_install); GURL icon = ExtensionIconSource::GetIconURL(extension, @@ -457,12 +461,18 @@ void ExtensionSettingsHandler::GetLocalizedValues( l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED)); source->AddString("extensionSettingsManagedMode", l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_MANAGED_USER)); + source->AddString("extensionSettingsCorruptInstall", + l10n_util::GetStringUTF16( + IDS_EXTENSIONS_CORRUPTED_EXTENSION)); source->AddString("extensionSettingsSuspiciousInstall", l10n_util::GetStringFUTF16( IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE, l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE))); - source->AddString("extensionSettingsSuspiciousInstallLearnMore", + source->AddString("extensionSettingsLearnMore", l10n_util::GetStringUTF16(IDS_LEARN_MORE)); + source->AddString("extensionSettingsCorruptInstallHelpUrl", + base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam( + GURL(chrome::kCorruptExtensionURL)).spec())); source->AddString("extensionSettingsSuspiciousInstallHelpUrl", base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam( GURL(chrome::kRemoveNonCWSExtensionURL)).spec())); |