chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc - Issue 419293002: IME refactoring: ChromeOS introduce input methods State.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. Created 6 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

« chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('K') | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/l10n_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

index a4d9b6a50f0e24bd90a68e90cd7827f458213214..d7ca05156416b9062963f8ceac1dd5ef5d20dfcc 100644

--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

@@ -329,7 +329,7 @@ void KeyboardOverlayHandler::GetInputMethodId(const base::ListValue* args) {

chromeos::input_method::InputMethodManager* manager =

chromeos::input_method::InputMethodManager::Get();

const chromeos::input_method::InputMethodDescriptor& descriptor =

- manager->GetCurrentInputMethod();

+ manager->GetActiveIMEState()->GetCurrentInputMethod();

base::StringValue param(descriptor.id());

web_ui()->CallJavascriptFunction("initKeyboardOverlayId", param);

}