Simplify the translate infobar code some.

chrome/browser/translate/options_menu_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/translate/options_menu_model.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.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;
 
 OptionsMenuModel::OptionsMenuModel(
     TranslateInfoBarDelegate* translate_delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       translate_infobar_delegate_(translate_delegate) {
-  string16 original_language = translate_delegate->GetLanguageDisplayableNameAt(
+  string16 original_language = translate_delegate->language_name_at(
       translate_delegate->original_language_index());
-  string16 target_language = translate_delegate->GetLanguageDisplayableNameAt(
+  string16 target_language = translate_delegate->language_name_at(
       translate_delegate->target_language_index());
 
   // Populate the menu.
   // Incognito mode does not get any preferences related items.
   if (!translate_delegate->owner()->GetWebContents()->
       GetBrowserContext()->IsOffTheRecord()) {
     AddCheckItem(IDC_TRANSLATE_OPTIONS_ALWAYS,
         l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS_ALWAYS,
             original_language, target_language));
     AddCheckItem(IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_LANG,
@@ skipping 97 matching lines @@
         web_contents->OpenURL(params);
       }
       break;
     }
 
     default:
       NOTREACHED() << "Invalid command id from menu.";
       break;
   }
 }