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

Unified Diff: chrome/browser/chromeos/input_method/input_method_persistence.cc

Issue 22980018: Disable non Latin keyboard layout on Lock screen and Sign-in screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test case. Created 7 years, 4 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
Index: chrome/browser/chromeos/input_method/input_method_persistence.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.cc b/chrome/browser/chromeos/input_method/input_method_persistence.cc
index 49809fe1aa04807a5bf99efaafe701af5356f4d4..da379941324bd8e2b925c241fb46acbda857c696 100644
--- a/chrome/browser/chromeos/input_method/input_method_persistence.cc
+++ b/chrome/browser/chromeos/input_method/input_method_persistence.cc
@@ -33,7 +33,7 @@ static void SetUserLRUInputMethod(
const chromeos::input_method::InputMethodManager* const manager) {
// Skip if it's not a keyboard layout. Drop input methods including
// extension ones.
- if (!InputMethodUtil::IsKeyboardLayout(input_method))
+ if (!manager->IsLoginKeyboard(input_method))
return;
PrefService* const local_state = g_browser_process->local_state();
@@ -43,7 +43,7 @@ static void SetUserLRUInputMethod(
if (profile == NULL)
return;
- if (!manager->IsFullLatinKeyboard(input_method))
+ if (!manager->IsLoginKeyboard(input_method))
return;
const std::string username = profile->GetProfileName();
@@ -124,7 +124,7 @@ void InputMethodPersistence::InputMethodChanged(
// Save the new input method id depending on the current browser state.
switch (state_) {
case InputMethodManager::STATE_LOGIN_SCREEN:
- if (!InputMethodUtil::IsKeyboardLayout(current_input_method)) {
+ if (!manager->IsLoginKeyboard(current_input_method)) {
DVLOG(1) << "Only keyboard layouts are supported: "
<< current_input_method;
return;

Powered by Google App Engine
This is Rietveld 408576698