chrome/browser/chromeos/input_method/mode_indicator_controller.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/chromeos/input_method/mode_indicator_controller.cc

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

Patch Set: Unit test fixed. Re-sorted methods of StateImpl and IMM. 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

« no previous file with comments | « chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/mode_indicator_controller.cc

diff --git a/chrome/browser/chromeos/input_method/mode_indicator_controller.cc b/chrome/browser/chromeos/input_method/mode_indicator_controller.cc

index 716cb08969c8782caee9b5a5cb4f98d619d685d2..30bcc4ef6344b0964ab04c074494c98ffe332f36 100644

--- a/chrome/browser/chromeos/input_method/mode_indicator_controller.cc

+++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.cc

@@ -100,7 +100,8 @@ void ModeIndicatorController::ShowModeIndicator() {

return;

// Get the short name of the changed input method (e.g. US, JA, etc.)

- const InputMethodDescriptor descriptor = imm_->GetCurrentInputMethod();

+ const InputMethodDescriptor descriptor =

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

const base::string16 short_name =

imm_->GetInputMethodUtil()->GetInputMethodShortName(descriptor);