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

Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

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

index c4f599f8530b95b525dbcb7848ad97833a0662de..d8c5522bf05ec05082f1c17069ddd5a69603a769 100644

--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

@@ -90,7 +90,7 @@ void CrosLanguageOptionsHandler::GetLocalizedValues(

input_method::InputMethodManager* manager =

input_method::InputMethodManager::Get();

input_method::InputMethodDescriptors ext_ime_descriptors;

- manager->GetInputMethodExtensions(&ext_ime_descriptors);

+ manager->GetActiveIMEState()->GetInputMethodExtensions(&ext_ime_descriptors);

base::ListValue* ext_ime_list = ConvertInputMethodDescriptorsToIMEList(

ext_ime_descriptors);

@@ -229,8 +229,9 @@ void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback(

return;

const input_method::InputMethodDescriptor* ime =

- input_method::InputMethodManager::Get()->GetInputMethodFromId(

- input_method_id);

+ input_method::InputMethodManager::Get()

+ ->GetActiveIMEState()

+ ->GetInputMethodFromId(input_method_id);

if (!ime)

return;