Remove redundant "keyboard layout" suffix and fix redundant language display.

chrome/browser/chromeos/status/language_menu_button.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
 #pragma once
 
 #include "app/menus/simple_menu_model.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
@@ skipping 52 matching lines @@
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Converts an InputMethodDescriptor object into human readable string.
   // Returns a text for the indicator on top right corner of the Chrome window.
   static std::wstring GetTextForIndicator(
       const InputMethodDescriptor& input_method);
 
   // Converts an InputMethodDescriptor object into human readable string.
   // Returns a string for the drop-down menu and the tooltip for the indicator.
-  static std::wstring GetTextForMenu(
-      const InputMethodDescriptor& input_method, bool add_method_name);
+  static std::wstring GetTextForMenu(const InputMethodDescriptor& input_method);
 
   // Registers input method preferences for the login screen.
   static void RegisterPrefs(PrefService* local_state);
 
-  // Gets the language codes that are ambiguous if we only show the
-  // language names in the menu. For these languages, we'll show the input
-  // method names in addition to the language names. The original contents
-  // of |ambiguous_language_code_set| are lost.
-  static void GetAmbiguousLanguageCodeSet(
-      const InputMethodDescriptors& input_method_descriptors,
-      std::set<std::string>* ambiguous_language_code_set);
-
  protected:
   // views::View implementation.
   virtual void OnLocaleChanged();
 
  private:
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // Updates the status area with |name| and tooltip with |tooltip|.
   void UpdateIndicator(const std::wstring& name, const std::wstring& tooltip);
@@ skipping 19 matching lines @@
   // item.
   bool IndexPointsToConfigureImeMenuItem(int index) const;
 
   // The current input method list.
   scoped_ptr<InputMethodDescriptors> input_method_descriptors_;
 
   // Objects for reading/writing the Chrome prefs.
   StringPrefMember previous_input_method_pref_;
   StringPrefMember current_input_method_pref_;
 
-  // Language codes that can be ambiguous. See comments at
-  // GetAmbiguousLanguageCodeSet() for details.
-  std::set<std::string> ambiguous_language_code_set_;
-
   // We borrow menus::SimpleMenuModel implementation to maintain the current
   // content of the pop-up menu. The menus::MenuModel is implemented using this
   // |model_|.
   scoped_ptr<menus::SimpleMenuModel> model_;
 
   // The language menu which pops up when the button in status area is clicked.
   views::Menu2 language_menu_;
 
   StatusAreaHost* host_;
   NotificationRegistrar registrar_;
   bool logged_in_;
 
   DISALLOW_COPY_AND_ASSIGN(LanguageMenuButton);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_