OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/input_method/input_method_syncer.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_syncer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 "", | 133 "", |
134 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 134 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
135 registry->RegisterStringPref( | 135 registry->RegisterStringPref( |
136 prefs::kLanguagePreloadEnginesSyncable, | 136 prefs::kLanguagePreloadEnginesSyncable, |
137 "", | 137 "", |
138 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 138 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
139 registry->RegisterStringPref( | 139 registry->RegisterStringPref( |
140 prefs::kLanguageEnabledExtensionImesSyncable, | 140 prefs::kLanguageEnabledExtensionImesSyncable, |
141 "", | 141 "", |
142 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 142 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
143 registry->RegisterBooleanPref( | 143 registry->RegisterBooleanPref(prefs::kLanguageShouldMergeInputMethods, false); |
144 prefs::kLanguageShouldMergeInputMethods, | |
145 false, | |
146 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
147 } | 144 } |
148 | 145 |
149 void InputMethodSyncer::Initialize() { | 146 void InputMethodSyncer::Initialize() { |
150 // This causes OnIsSyncingChanged to be called when the value of | 147 // This causes OnIsSyncingChanged to be called when the value of |
151 // PrefService::IsSyncing() changes. | 148 // PrefService::IsSyncing() changes. |
152 prefs_->AddObserver(this); | 149 prefs_->AddObserver(this); |
153 | 150 |
154 preferred_languages_syncable_.Init(prefs::kLanguagePreferredLanguagesSyncable, | 151 preferred_languages_syncable_.Init(prefs::kLanguagePreferredLanguagesSyncable, |
155 prefs_); | 152 prefs_); |
156 preload_engines_syncable_.Init(prefs::kLanguagePreloadEnginesSyncable, | 153 preload_engines_syncable_.Init(prefs::kLanguagePreloadEnginesSyncable, |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 | 316 |
320 void InputMethodSyncer::OnIsSyncingChanged() { | 317 void InputMethodSyncer::OnIsSyncingChanged() { |
321 if (prefs_->GetBoolean(prefs::kLanguageShouldMergeInputMethods) && | 318 if (prefs_->GetBoolean(prefs::kLanguageShouldMergeInputMethods) && |
322 prefs_->IsSyncing()) { | 319 prefs_->IsSyncing()) { |
323 MergeSyncedPrefs(); | 320 MergeSyncedPrefs(); |
324 } | 321 } |
325 } | 322 } |
326 | 323 |
327 } // namespace input_method | 324 } // namespace input_method |
328 } // namespace chromeos | 325 } // namespace chromeos |
OLD | NEW |