chrome/browser/chromeos/input_method/input_method_manager_impl.cc - Issue 375363002: Makes sure InputMethodEngine::Enable() can be called after chrome starts.

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_manager_impl.cc

Issue 375363002: Makes sure InputMethodEngine::Enable() can be called after chrome starts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: change solution, mitigate risk. 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:

View side-by-side diff with in-line comments

Download patch

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

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

index 33951f236c13854458fe3b4090db06653ebf9041..b89db86fbb9bd2782507aaddfeb76bb2da07a0db 100644

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

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

@@ -22,6 +22,7 @@

#include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h"

#include "chrome/browser/chromeos/input_method/input_method_engine.h"

#include "chrome/browser/chromeos/language_preferences.h"

+#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/pref_names.h"

#include "chromeos/ime/component_extension_ime_manager.h"

@@ -486,6 +487,11 @@ void InputMethodManagerImpl::AddInputMethodExtension(

profile_engine_map_[GetProfile()][id] = engine;

+ if (id == current_input_method_.id()) {

+ IMEBridge::Get()->SetCurrentEngineHandler(engine);

+ engine->Enable();

+ }

if (extension_ime_util::IsComponentExtensionIME(id))

return;

« no previous file with comments | « no previous file | no next file » | no next file with comments »