Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1189)

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 10399046: Remove virtual keyboard support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index eaa1200c7be3f4df587cff85a19f5ffa0409ff3b..0c42f481e565736d7c557dba971f2536265f03da 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -234,9 +234,6 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
language_prefs::kXkbAutoRepeatIntervalInMs,
PrefService::UNSYNCABLE_PREF);
- prefs->RegisterDictionaryPref(prefs::kLanguagePreferredVirtualKeyboard,
- PrefService::SYNCABLE_PREF);
-
// Screen lock default to off.
prefs->RegisterBooleanPref(prefs::kEnableScreenLock,
false,
@@ -358,9 +355,6 @@ void Preferences::Init(PrefService* prefs) {
// Initialize preferences to currently saved state.
NotifyPrefChanged(NULL);
- // Initialize virtual keyboard settings to currently saved state.
- UpdateVirturalKeyboardPreference(prefs);
-
// If a guest is logged in, initialize the prefs as if this is the first
// login.
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
@@ -710,30 +704,4 @@ void Preferences::UpdateAutoRepeatRate() {
input_method::XKeyboard::SetAutoRepeatRate(rate);
}
-// static
-void Preferences::UpdateVirturalKeyboardPreference(PrefService* prefs) {
- const DictionaryValue* virtual_keyboard_pref =
- prefs->GetDictionary(prefs::kLanguagePreferredVirtualKeyboard);
- DCHECK(virtual_keyboard_pref);
-
- // TODO(yusukes): Clear all virtual keyboard preferences here.
- std::string url;
- std::vector<std::string> layouts_to_remove;
- for (DictionaryValue::key_iterator iter = virtual_keyboard_pref->begin_keys();
- iter != virtual_keyboard_pref->end_keys();
- ++iter) {
- const std::string& layout_id = *iter; // e.g. "us", "handwriting-vk"
- if (!virtual_keyboard_pref->GetString(layout_id, &url))
- continue;
- // TODO(yusukes): add the virtual keyboard preferences here.
- }
-
- // Remove invalid prefs.
- DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard);
- DictionaryValue* pref_value = updater.Get();
- for (size_t i = 0; i < layouts_to_remove.size(); ++i) {
- pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL);
- }
-}
-
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698