summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/language_library.cc4
-rw-r--r--chrome/browser/chromeos/language_library.h2
-rw-r--r--chrome/browser/chromeos/language_menu_button.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/language_library.cc b/chrome/browser/chromeos/language_library.cc
index 4d8899c..69efcec 100644
--- a/chrome/browser/chromeos/language_library.cc
+++ b/chrome/browser/chromeos/language_library.cc
@@ -74,10 +74,10 @@ void LanguageLibrary::RemoveObserver(Observer* observer) {
observers_.RemoveObserver(observer);
}
-chromeos::InputLanguageList* LanguageLibrary::GetLanguages() {
+chromeos::InputLanguageList* LanguageLibrary::GetActiveLanguages() {
chromeos::InputLanguageList* result = NULL;
if (EnsureLoaded()) {
- result = chromeos::GetLanguages(language_status_connection_);
+ result = chromeos::GetActiveLanguages(language_status_connection_);
}
return result ? result : CreateFallbackInputLanguageList();
}
diff --git a/chrome/browser/chromeos/language_library.h b/chrome/browser/chromeos/language_library.h
index f19c989..9db3172 100644
--- a/chrome/browser/chromeos/language_library.h
+++ b/chrome/browser/chromeos/language_library.h
@@ -40,7 +40,7 @@ class LanguageLibrary {
// (i.e. active). If the cros library is not found or IBus/DBus daemon
// is not alive, this function returns a fallback language list (and
// never returns NULL).
- InputLanguageList* GetLanguages();
+ InputLanguageList* GetActiveLanguages();
// Returns the list of IMEs and keyboard layouts we support, including
// ones not active. If the cros library is not found or IBus/DBus
diff --git a/chrome/browser/chromeos/language_menu_button.cc b/chrome/browser/chromeos/language_menu_button.cc
index 38bad35..89850bb 100644
--- a/chrome/browser/chromeos/language_menu_button.cc
+++ b/chrome/browser/chromeos/language_menu_button.cc
@@ -105,7 +105,7 @@ namespace chromeos {
LanguageMenuButton::LanguageMenuButton(Browser* browser)
: MenuButton(NULL, std::wstring(), this, false),
- language_list_(LanguageLibrary::Get()->GetLanguages()),
+ language_list_(LanguageLibrary::Get()->GetActiveLanguages()),
model_(NULL),
// Be aware that the constructor of |language_menu_| calls GetItemCount()
// in this class. Therefore, GetItemCount() have to return 0 when
@@ -311,7 +311,7 @@ void LanguageMenuButton::ActivatedAt(int index) {
// LanguageMenuButton, views::ViewMenuDelegate implementation:
void LanguageMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
- language_list_.reset(LanguageLibrary::Get()->GetLanguages());
+ language_list_.reset(LanguageLibrary::Get()->GetActiveLanguages());
RebuildModel();
language_menu_.Rebuild();
language_menu_.UpdateStates();