summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/options/language_config_model.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 03:46:17 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 03:46:17 +0000
commit7071360441609aa3c8d44c1e9018148c3246c7d9 (patch)
tree3ad55d12667fcd25c77ba57fbf89d2ac71483793 /chrome/browser/chromeos/options/language_config_model.cc
parent325358b8f7e145d69300b1186985a57ab59a546c (diff)
downloadchromium_src-7071360441609aa3c8d44c1e9018148c3246c7d9.zip
chromium_src-7071360441609aa3c8d44c1e9018148c3246c7d9.tar.gz
chromium_src-7071360441609aa3c8d44c1e9018148c3246c7d9.tar.bz2
Simplify LanguageConfigModel
Get rid of Init() method from LanguageConfigModel, and add a call to NotifyPrefChanged() in the constructor. Along the way, fix a sytle issue in LanguageConfigView. Per the style guide, model should look like model_, as it's a member variable. TEST=manually on the netbook. BUG=none Review URL: http://codereview.chromium.org/2872031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/options/language_config_model.cc')
-rw-r--r--chrome/browser/chromeos/options/language_config_model.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc
index 6955c43..e4a398f 100644
--- a/chrome/browser/chromeos/options/language_config_model.cc
+++ b/chrome/browser/chromeos/options/language_config_model.cc
@@ -73,9 +73,6 @@ void AddLanguageComboboxModel::SetIgnored(
LanguageConfigModel::LanguageConfigModel(PrefService* pref_service)
: pref_service_(pref_service) {
-}
-
-void LanguageConfigModel::Init() {
// Initialize the maps and vectors.
InitInputMethodIdVectors();
@@ -85,6 +82,9 @@ void LanguageConfigModel::Init() {
// here and compare the result and preload_engines_.GetValue(). If there's
// a discrepancy between IBus setting and Chrome prefs, we can resolve it
// by calling preload_engines_SetValue() here.
+
+ // Initialize the language codes currently activated.
+ NotifyPrefChanged();
}
size_t LanguageConfigModel::CountNumActiveInputMethods(