chrome/browser/chromeos/input_method/input_method_manager_impl.cc - Issue 10388181: Remove virtual keyboard support from input_method_descriptor.h.

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 10388181: Remove virtual keyboard support from input_method_descriptor.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review Created 8 years, 7 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_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 c9eacb8be74e00f0f4ac82afa53e7d12740464e1..4a9c113bcf2b4cc9d68017be6932bb294efa519a 100644

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

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

@@ -296,9 +296,8 @@ void InputMethodManagerImpl::AddInputMethodExtension(

return;

}

- const std::string virtual_layouts = JoinString(layouts, ',');

- extra_input_methods_[id] = InputMethodDescriptor(

- whitelist_, id, name, virtual_layouts, language);

+ const std::string layout = layouts.empty() ? "" : layouts[0];

+ extra_input_methods_[id] = InputMethodDescriptor(id, name, layout, language);

if (!Contains(active_input_method_ids_, id)) {

active_input_method_ids_.push_back(id);