Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3548)

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 136693012: [IME] Supports options page for each IME instead of single options page for each IME extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed unit tests compiling errors. Created 6 years, 11 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 0b710197fe7f61bc274c1b28af164e265b91c07b..762aaf45c2189047b78f977b3d16842e34509a58 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -146,6 +146,19 @@ size_t InputMethodManagerImpl::GetNumActiveInputMethods() const {
return active_input_method_ids_.size();
}
+const InputMethodDescriptor* InputMethodManagerImpl::GetInputMethodFromId(
+ const std::string& input_method_id) const {
+ const InputMethodDescriptor* ime = util_.GetInputMethodDescriptorFromId(
+ input_method_id);
+ if (!ime) {
+ std::map<std::string, InputMethodDescriptor>::const_iterator ix =
+ extra_input_methods_.find(input_method_id);
+ if (ix != extra_input_methods_.end())
+ ime = &ix->second;
+ }
+ return ime;
+}
+
void InputMethodManagerImpl::EnableLayouts(const std::string& language_code,
const std::string& initial_layout) {
if (state_ == STATE_TERMINATING)

Powered by Google App Engine
This is Rietveld 408576698