diff options
| author | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 00:17:29 +0000 |
|---|---|---|
| committer | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 00:17:29 +0000 |
| commit | 3a3cbed4ba0c375d64179ab93dc9a4ae9aade8c0 (patch) | |
| tree | fbb117c05b59c1122bed0ecf7b26a5ff21e312a9 | |
| parent | 222546fe9a3754f71652aefbd82bc2ec89b8eabe (diff) | |
| download | chromium_src-3a3cbed4ba0c375d64179ab93dc9a4ae9aade8c0.zip chromium_src-3a3cbed4ba0c375d64179ab93dc9a4ae9aade8c0.tar.gz chromium_src-3a3cbed4ba0c375d64179ab93dc9a4ae9aade8c0.tar.bz2 | |
Add a Learn More link to app-unreachable page.
BUG=chromium-os:21867
TEST=manual
Review URL: http://codereview.chromium.org/8962005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115237 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/localized_error.cc | 21 | ||||
| -rw-r--r-- | chrome/renderer/resources/error_app.html | 3 |
2 files changed, 22 insertions, 2 deletions
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index 9451d6b..8ff8964 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -33,11 +33,18 @@ namespace { static const char kRedirectLoopLearnMoreUrl[] = "https://www.google.com/support/chrome/bin/answer.py?answer=95626"; static const char kWeakDHKeyLearnMoreUrl[] = - "http://sites.google.com/a/chromium.org/dev/err_ssl_weak_server_ephemeral_dh_key"; + "http://sites.google.com/a/chromium.org/dev/" + "err_ssl_weak_server_ephemeral_dh_key"; static const char kESETLearnMoreUrl[] = "http://kb.eset.com/esetkb/index?page=content&id=SOLN2588"; static const char kKasperskyLearnMoreUrl[] = - "http://support.kaspersky.com/kav2012/settings/options?print=true&qid=208284701"; + "http://support.kaspersky.com/kav2012/settings/options" + "?print=true&qid=208284701"; +#if defined(OS_CHROMEOS) +static const char kAppWarningLearnMoreUrl[] = + "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html" + "?answer=1721911"; +#endif // defined(OS_CHROMEOS) enum NAV_SUGGESTIONS { SUGGEST_NONE = 0, @@ -705,4 +712,14 @@ void LocalizedError::GetAppErrorStrings( error_strings->SetString("name", app->name()); error_strings->SetString("msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING)); + +#if defined(OS_CHROMEOS) + GURL learn_more_url(kAppWarningLearnMoreUrl); + DictionaryValue* suggest_learn_more = new DictionaryValue(); + suggest_learn_more->SetString("msg", + l10n_util::GetStringUTF16( + IDS_ERRORPAGES_SUGGESTION_LEARNMORE)); + suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); + error_strings->Set("suggestionsLearnMore", suggest_learn_more); +#endif // defined(OS_CHROMEOS) } diff --git a/chrome/renderer/resources/error_app.html b/chrome/renderer/resources/error_app.html index 5911e23..028548a 100644 --- a/chrome/renderer/resources/error_app.html +++ b/chrome/renderer/resources/error_app.html @@ -41,6 +41,9 @@ body { <div style="display:inline-block; vertical-align: middle;"> <div id="name" jsvalues=".innerText:name"></div> <div id="msg" jsvalues=".innerText:msg"></div> +<div id="suggestions" jsselect="suggestionsLearnMore"> + <span jsvalues=".innerHTML:msg"></span> +</div> </div> </div> |