chrome/browser/chromeos/input_method/input_method_util.h - Issue 190033005: [IME] Removes the duplicated IMEs in chrome://settings/languages, and support async component IMEs …

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_util.h

Issue 190033005: [IME] Removes the duplicated IMEs in chrome://settings/languages, and support async component IMEs … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: try to make test green. Created 6 years, 9 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

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc ('k') | chrome/browser/chromeos/input_method/input_method_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/input_method_util.h

diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h

index eea2d9e586d496e5760b0195a5b003470946bee6..faa66b879f52ebd70b61df9e7cadd108f0e4f79a 100644

--- a/chrome/browser/chromeos/input_method/input_method_util.h

+++ b/chrome/browser/chromeos/input_method/input_method_util.h

@@ -140,6 +140,9 @@ class InputMethodUtil {

// Sets the list of component extension IMEs.

void SetComponentExtensions(const InputMethodDescriptors& imes);

+ // Initializes the extension based xkb IMEs for testing.

+ void InitXkbInputMethodsForTesting();

// Returns the fallback input method descriptor (the very basic US

// keyboard). This function is mostly used for testing, but may be used

// as the fallback, when there is no other choice.

@@ -190,7 +193,7 @@ class InputMethodUtil {

std::map<std::string, std::string> id_to_language_code_;

InputMethodIdToDescriptorMap id_to_descriptor_;

XkbIdToDescriptorMap xkb_id_to_descriptor_;

- ComponentExtIMEMap component_extension_ime_id_to_descriptor_;

+ std::map<std::string, std::string> xkb_layout_to_indicator_;

typedef base::hash_map<std::string, int> HashType;

HashType english_to_resource_id_;