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

Unified Diff: chromeos/ime/gen_input_methods.py

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
« no previous file with comments | « chromeos/ime/component_extension_ime_manager.cc ('k') | chromeos/ime/input_method_descriptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/ime/gen_input_methods.py
diff --git a/chromeos/ime/gen_input_methods.py b/chromeos/ime/gen_input_methods.py
index a9f90bf512e8b695c74397d5185afa4ccc467aa3..7e3993de5ad5e9ab32d8b0e80d47c0751632df29 100755
--- a/chromeos/ime/gen_input_methods.py
+++ b/chromeos/ime/gen_input_methods.py
@@ -26,13 +26,14 @@ struct InputMethodsInfo {
const char* input_method_id;
const char* language_code;
const char* xkb_keyboard_id;
+ bool is_login_keyboard;
};
const InputMethodsInfo kInputMethods[] = {
- {"mozc-chewing", "zh-TW", "us"},
- {"xkb:us::eng", "en-US", "us"},
- {"xkb:us:dvorak:eng", "en-US", "us(dvorak)"},
- {"xkb:be::fra", "fr", "be"},
- {"xkb:br::por", "pt-BR", "br"},
+ {"xkb:us::eng", "en-US", "us", true},
+ {"xkb:us:dvorak:eng", "en-US", "us(dvorak)", true},
+ {"xkb:be::fra", "fr", "be", true},
+ {"xkb:br::por", "pt-BR", "br", true},
+ {"xkb:ru::rus", "ru", "ru", false},
};
} // namespace input_method
@@ -57,13 +58,14 @@ struct InputMethodsInfo {
const char* input_method_id;
const char* language_code;
const char* xkb_layout_id;
+ bool is_login_keyboard;
};
const InputMethodsInfo kInputMethods[] = {
"""
CPP_FORMAT = '#if %s\n'
ENGINE_FORMAT = (' {"%(input_method_id)s", "%(language_code)s", ' +
- '"%(xkb_layout_id)s"},\n')
+ '"%(xkb_layout_id)s", %(is_login_keyboard)s},\n')
OUTPUT_FOOTER = """
};
@@ -110,8 +112,11 @@ def main(argv):
engine['input_method_id'] = columns[0]
engine['xkb_layout_id'] = columns[1]
engine['language_code'] = columns[2]
+ is_login_keyboard = "false"
if len(columns) == 4:
- engine['if'] = columns[3]
+ assert columns[3] == "login", "Invalid attribute: " + columns[3]
+ is_login_keyboard = "true"
+ engine['is_login_keyboard'] = is_login_keyboard
engines.append(engine)
output = CreateEngineHeader(engines)
« no previous file with comments | « chromeos/ime/component_extension_ime_manager.cc ('k') | chromeos/ime/input_method_descriptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698