diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 01:06:27 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 01:06:27 +0000 |
| commit | 51d50f093404db2e755e738f2bd90b8cc96f617f (patch) | |
| tree | ff3ecd6624ab736ace0df7f70b4f4fc060be1297 | |
| parent | 6b3cb33b0dccf3a6eea142605e463925fda750de (diff) | |
| download | chromium_src-51d50f093404db2e755e738f2bd90b8cc96f617f.zip chromium_src-51d50f093404db2e755e738f2bd90b8cc96f617f.tar.gz chromium_src-51d50f093404db2e755e738f2bd90b8cc96f617f.tar.bz2 | |
Add a 'more info' link to the off-store install infobar.
BUG=133873
Review URL: https://chromiumcodereview.appspot.com/10597007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143322 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_install_ui_default.cc | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 0708ebf..b4585af 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4446,7 +4446,7 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME Expected ID "<ph name="EXPECTED_ID">$1<ex>bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb</ex></ph>", but ID was "<ph name="NEW_ID">$2<ex>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</ex></ph>". </message> <message name="IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE" desc="Error displayed during installation of an extension when installation is not allowed from the current site."> - Extensions, apps, and user scripts cannot be added from this web site. + Extensions, apps, and user scripts can only be added from the Chrome Web Store. </message> <message name="IDS_EXTENSION_INSTALL_UNEXPECTED_VERSION" desc="Error displayed during installation of a side-loaded app, extension, or theme when the version of the referenced extension does not match the version the developer declared during registration."> Expected version "<ph name="EXPECTED_VERSION">$1<ex>2.0</ex></ph>", but version was "<ph name="NEW_ID">$2<ex>1.0</ex></ph>". diff --git a/chrome/browser/extensions/extension_install_ui_default.cc b/chrome/browser/extensions/extension_install_ui_default.cc index 06c3ed7..b74f791 100644 --- a/chrome/browser/extensions/extension_install_ui_default.cc +++ b/chrome/browser/extensions/extension_install_ui_default.cc @@ -65,17 +65,15 @@ class ErrorInfobarDelegate : public ConfirmInfoBarDelegate { } virtual string16 GetLinkText() const OVERRIDE { - // TODO(aa): Return the learn more link once we have the help article - // posted. - // return error_.type() == CrxInstallerError::ERROR_OFF_STORE ? - // l10n_util::GetStringUTF16(IDS_LEARN_MORE) : ASCIIToUTF16(""); - return ASCIIToUTF16(""); + return error_.type() == CrxInstallerError::ERROR_OFF_STORE ? + l10n_util::GetStringUTF16(IDS_LEARN_MORE) : ASCIIToUTF16(""); } virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE { - browser::NavigateParams params(browser_, - GURL("http://www.google.com/"), - content::PAGE_TRANSITION_LINK); + browser::NavigateParams params( + browser_, + GURL("http://support.google.com/chrome_webstore/?p=crx_warning"), + content::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; browser::Navigate(¶ms); return false; |