summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/language_library.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 07:40:49 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 07:40:49 +0000
commit0a02c755304fdd5078475ffcec2ff5ed7452a68f (patch)
tree36b42c3483a1598b83783c5bc3e02c2b9e8e781e /chrome/browser/chromeos/language_library.cc
parente22df60d5295794f9ec744b2888dbe9b486c57bc (diff)
downloadchromium_src-0a02c755304fdd5078475ffcec2ff5ed7452a68f.zip
chromium_src-0a02c755304fdd5078475ffcec2ff5ed7452a68f.tar.gz
chromium_src-0a02c755304fdd5078475ffcec2ff5ed7452a68f.tar.bz2
Rename LanguageLibrary::GetLanguages() to GetActiveLanguages().
TEST=built locally BUG=none Review URL: http://codereview.chromium.org/546076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/language_library.cc')
-rw-r--r--chrome/browser/chromeos/language_library.cc4
1 files changed, 2 insertions, 2 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();
}