| Index: chrome/browser/translate/options_menu_model.cc
|
| diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc
|
| index 6422f1673cbfc61612ed6b50c2839030c66a05f4..9b16323ce65869bc059537b180527a349776bc15 100644
|
| --- a/chrome/browser/translate/options_menu_model.cc
|
| +++ b/chrome/browser/translate/options_menu_model.cc
|
| @@ -7,23 +7,28 @@
|
| #include "base/metrics/histogram.h"
|
| #include "chrome/app/chrome_command_ids.h"
|
| #include "chrome/browser/translate/translate_infobar_delegate.h"
|
| -#include "chrome/common/url_constants.h"
|
| -#include "content/public/browser/web_contents.h"
|
| +#include "components/translate/core/browser/translate_driver.h"
|
| #include "grit/component_strings.h"
|
| #include "grit/locale_settings.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| -using content::NavigationEntry;
|
| -using content::OpenURLParams;
|
| -using content::Referrer;
|
| -using content::WebContents;
|
| +namespace {
|
| +
|
| +const char kAboutGoogleTranslateURL[] =
|
| +#if defined(OS_CHROMEOS)
|
| + "https://support.google.com/chromeos/?p=ib_translation_bar";
|
| +#else
|
| + "https://support.google.com/chrome/?p=ib_translation_bar";
|
| +#endif
|
| +
|
| +} // namespace
|
|
|
| OptionsMenuModel::OptionsMenuModel(
|
| TranslateInfoBarDelegate* translate_delegate)
|
| : ui::SimpleMenuModel(this),
|
| translate_infobar_delegate_(translate_delegate) {
|
| // |translate_delegate| must already be owned.
|
| - DCHECK(translate_infobar_delegate_->GetWebContents());
|
| + DCHECK(translate_infobar_delegate_->GetTranslateDriver());
|
|
|
| base::string16 original_language = translate_delegate->language_name_at(
|
| translate_delegate->original_language_index());
|
| @@ -121,13 +126,10 @@ void OptionsMenuModel::ExecuteCommand(int command_id, int event_flags) {
|
| break;
|
|
|
| case IDC_TRANSLATE_OPTIONS_ABOUT: {
|
| - WebContents* web_contents = translate_infobar_delegate_->GetWebContents();
|
| - if (web_contents) {
|
| - OpenURLParams params(
|
| - GURL(chrome::kAboutGoogleTranslateURL), Referrer(),
|
| - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false);
|
| - web_contents->OpenURL(params);
|
| - }
|
| + TranslateDriver* translate_driver =
|
| + translate_infobar_delegate_->GetTranslateDriver();
|
| + if (translate_driver)
|
| + translate_driver->OpenUrlInNewTab(GURL(kAboutGoogleTranslateURL));
|
| break;
|
| }
|
|
|
|
|