From 91a79239222020a645e69e6db55d24e4d5bb2ca9 Mon Sep 17 00:00:00 2001 From: "derat@chromium.org" Date: Wed, 10 Nov 2010 18:15:08 +0000 Subject: chromeos: Update help URLs. This also moves some untranslatable URL strings out of .grd files and into code so we don't duplicate them per-language. BUG=chromium-os:8117 TEST=trybots; also built and ran the chrome os version Review URL: http://codereview.chromium.org/4495001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65683 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/translate/options_menu_model.cc | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'chrome/browser/translate') diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc index 975140e..e9b0943 100644 --- a/chrome/browser/translate/options_menu_model.cc +++ b/chrome/browser/translate/options_menu_model.cc @@ -8,12 +8,24 @@ #include "base/metrics/histogram.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/google/google_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +namespace { + +const char kAboutGoogleTranslateUrl[] = +#if defined(OS_CHROMEOS) + "http://www.google.com/support/chromeos/bin/answer.py?answer=173424"; +#else + "http://www.google.com/support/chrome/bin/answer.py?answer=173424"; +#endif + +} // namespace + OptionsMenuModel::OptionsMenuModel( TranslateInfoBarDelegate* translate_delegate) : ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)), @@ -111,10 +123,10 @@ void OptionsMenuModel::ExecuteCommand(int command_id) { case IDC_TRANSLATE_OPTIONS_ABOUT: { TabContents* tab_contents = translate_infobar_delegate_->tab_contents(); if (tab_contents) { - string16 url = l10n_util::GetStringUTF16( - IDS_ABOUT_GOOGLE_TRANSLATE_URL); - tab_contents->OpenURL(GURL(url), GURL(), NEW_FOREGROUND_TAB, - PageTransition::LINK); + GURL about_url = google_util::AppendGoogleLocaleParam( + GURL(kAboutGoogleTranslateUrl)); + tab_contents->OpenURL( + about_url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); } break; } -- cgit v1.1