chrome/browser/chromeos/input_method/input_method_engine.cc - Issue 389913002: Moving IME manifests to chrome resources.

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/input_method_engine.cc

Issue 389913002: Moving IME manifests to chrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: removed duplicated XKB extension loading. Created 6 years, 5 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:

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

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

index 031edb1951b34fc6a9d54a8e78de6d65331bceb8..c8d3394c036c2e7f28248429ea62e2f652eb426e 100644

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

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

@@ -148,8 +148,7 @@ void InputMethodEngine::Initialize(

ComponentExtensionIMEManager* comp_ext_ime_manager =

manager->GetComponentExtensionIMEManager();

- if (comp_ext_ime_manager && comp_ext_ime_manager->IsInitialized() &&

- comp_ext_ime_manager->IsWhitelistedExtension(extension_id)) {

+ if (comp_ext_ime_manager->IsWhitelistedExtension(extension_id)) {

imm_id_ = comp_ext_ime_manager->GetId(extension_id, engine_id);

} else {

imm_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id);