chrome/browser/extensions/api/input_ime/input_ime_api.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/extensions/api/input_ime/input_ime_api.cc

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

Patch Set: Cleanup. 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/preferences.cc ('K') | « chrome/browser/chromeos/preferences_unittest.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/input_ime/input_ime_api.cc

diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc

index 452c195aebcb2769f248d791618694f543c99735..299ad72b61597d6baf332a238adf7c7ba2c2275c 100644

--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc

+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc

@@ -390,7 +390,8 @@ bool InputImeEventRouter::RegisterImeExtension(

chromeos::InputMethodEngine* engine = new chromeos::InputMethodEngine();

engine->Initialize(observer.Pass(), extension_id.c_str());

engine_map_[extension_id] = engine;

- manager->AddInputMethodExtension(extension_id, descriptors, engine);

+ manager->GetActiveIMEState()->AddInputMethodExtension(

+ extension_id, descriptors, engine);

return true;

#else

@@ -405,6 +406,7 @@ void InputImeEventRouter::UnregisterAllImes(const std::string& extension_id) {

engine_map_.find(extension_id);

if (it != engine_map_.end()) {

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

+ ->GetActiveIMEState()

->RemoveInputMethodExtension(extension_id);

delete it->second;

engine_map_.erase(it);