summaryrefslogtreecommitdiffstats
path: root/ui/views/controls/menu/menu_controller.cc
diff options
context:
space:
mode:
authorshuchen <shuchen@chromium.org>2015-07-01 19:11:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-02 02:11:48 +0000
commit12f77cb7c9b7b8256df62a4423e03e539a980b3b (patch)
tree89dbfb2402ab76c5e181ba8997077577f0e85888 /ui/views/controls/menu/menu_controller.cc
parent85f8564bcc24eb33885a13b8048f98e32dfc4062 (diff)
downloadchromium_src-12f77cb7c9b7b8256df62a4423e03e539a980b3b.zip
chromium_src-12f77cb7c9b7b8256df62a4423e03e539a980b3b.tar.gz
chromium_src-12f77cb7c9b7b8256df62a4423e03e539a980b3b.tar.bz2
Remove the 2-level input method system & InputMethodBridge.
This is IMF refactoring according to the design: - For @google.com: https://docs.google.com/document/d/14PQN4fbbSTlJmIk6qk7RzsuNr7O22DUTfNQ6slxKWV0 - For @chromium.org: https://docs.google.com/document/d/1sDES_kuEVUjb_FwCvKsg0Ef48edq5lAx589r0qUtG4g This cl includes some fundamental changes: 1) Removed ui/views/ime/... 2) All TextInputClient's use InputMethod::SetFocusedTextInputClient() to inform InputMethod that itself is focused. 3) Supports mocking input method in InputMethodFactory for TextfieldTest. 4) Removed views::View::GetTextInputClient() which is useless. The rest changes follow the above major changes. BUG=474828 TEST=Verified locally on Win7/Win8/Linux/CrOS/Mac. Tests passed. Review URL: https://codereview.chromium.org/1177503003 Cr-Commit-Position: refs/heads/master@{#337157}
Diffstat (limited to 'ui/views/controls/menu/menu_controller.cc')
-rw-r--r--ui/views/controls/menu/menu_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 062c5f1..54d3410 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -2078,7 +2078,7 @@ bool MenuController::SelectByChar(base::char16 character) {
return AcceptOrSelect(item, details);
if (is_combobox_) {
- item->GetSubmenu()->GetTextInputClient()->InsertChar(character, 0);
+ item->GetSubmenu()->GetPrefixSelector()->InsertChar(character, 0);
} else {
// If no mnemonics found, look at first character of titles.
details = FindChildForMnemonic(item, key, &TitleMatchesMnemonic);