chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.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/login/terms_of_service_screen_handler.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/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

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

index 8bf028754d98aa3a24f4cec7e2f947fdfcd508a6..3ac007891c77fb3d46f4f9e1415a4d1195cb009c 100644

--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

@@ -161,8 +161,10 @@ void TermsOfServiceScreenHandler::DoShow() {

// If the user has a preferred input method, enable it and switch to it.

chromeos::input_method::InputMethodManager* input_method_manager =

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

- input_method_manager->EnableInputMethod(input_methods.front());

- input_method_manager->ChangeInputMethod(input_methods.front());

+ input_method_manager->GetActiveIMEState()->EnableInputMethod(

+ input_methods.front());

+ input_method_manager->GetActiveIMEState()->ChangeInputMethod(

+ input_methods.front(), false /* show_message */);

}

// Updates the domain name shown in the UI.