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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_util.h

Issue 312443002: Updates the whitelisted XKB input method IDs to sync up with the component XKB extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
7 7
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 // Returns true if given input method can be used to input login data. 131 // Returns true if given input method can be used to input login data.
132 bool IsLoginKeyboard(const std::string& input_method_id) const; 132 bool IsLoginKeyboard(const std::string& input_method_id) const;
133 133
134 // Returns true if the given input method id is supported. 134 // Returns true if the given input method id is supported.
135 bool IsValidInputMethodId(const std::string& input_method_id) const; 135 bool IsValidInputMethodId(const std::string& input_method_id) const;
136 136
137 // Returns true if the given input method id is for a keyboard layout. 137 // Returns true if the given input method id is for a keyboard layout.
138 static bool IsKeyboardLayout(const std::string& input_method_id); 138 static bool IsKeyboardLayout(const std::string& input_method_id);
139 139
140 // Sets the list of component extension IMEs. 140 // Resets the list of component extension IMEs.
141 void SetComponentExtensions(const InputMethodDescriptors& imes); 141 void ResetInputMethods(const InputMethodDescriptors& imes);
142
143 // Appends the additional list of component extension IMEs.
144 void AppendInputMethods(const InputMethodDescriptors& imes);
142 145
143 // Initializes the extension based xkb IMEs for testing. 146 // Initializes the extension based xkb IMEs for testing.
144 void InitXkbInputMethodsForTesting(); 147 void InitXkbInputMethodsForTesting();
145 148
146 // Returns the fallback input method descriptor (the very basic US 149 // Returns the fallback input method descriptor (the very basic US
147 // keyboard). This function is mostly used for testing, but may be used 150 // keyboard). This function is mostly used for testing, but may be used
148 // as the fallback, when there is no other choice. 151 // as the fallback, when there is no other choice.
149 static InputMethodDescriptor GetFallbackInputMethodDescriptor(); 152 static InputMethodDescriptor GetFallbackInputMethodDescriptor();
150 153
151 protected: 154 protected:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 std::vector<std::string> hardware_login_layouts_; 205 std::vector<std::string> hardware_login_layouts_;
203 std::vector<std::string> cached_hardware_layouts_; 206 std::vector<std::string> cached_hardware_layouts_;
204 207
205 DISALLOW_COPY_AND_ASSIGN(InputMethodUtil); 208 DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
206 }; 209 };
207 210
208 } // namespace input_method 211 } // namespace input_method
209 } // namespace chromeos 212 } // namespace chromeos
210 213
211 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_ 214 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698