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

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

Issue 608183002: Move all white-listed input method indicator text from InputMethodUtil to manifests of IME extensio… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revised per comments. Created 6 years, 2 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 private: 176 private:
177 bool TranslateStringInternal(const std::string& english_string, 177 bool TranslateStringInternal(const std::string& english_string,
178 base::string16 *out_string) const; 178 base::string16 *out_string) const;
179 179
180 // Map from language code to associated input method IDs, etc. 180 // Map from language code to associated input method IDs, etc.
181 typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap; 181 typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;
182 182
183 LanguageCodeToIdsMap language_code_to_ids_; 183 LanguageCodeToIdsMap language_code_to_ids_;
184 InputMethodIdToDescriptorMap id_to_descriptor_; 184 InputMethodIdToDescriptorMap id_to_descriptor_;
185 std::map<std::string, std::string> xkb_layout_to_indicator_;
186 185
187 typedef base::hash_map<std::string, int> HashType; 186 typedef base::hash_map<std::string, int> HashType;
188 HashType english_to_resource_id_; 187 HashType english_to_resource_id_;
189 188
190 InputMethodDelegate* delegate_; 189 InputMethodDelegate* delegate_;
191 190
192 base::ThreadChecker thread_checker_; 191 base::ThreadChecker thread_checker_;
193 std::vector<std::string> hardware_layouts_; 192 std::vector<std::string> hardware_layouts_;
194 std::vector<std::string> hardware_login_layouts_; 193 std::vector<std::string> hardware_login_layouts_;
195 std::vector<std::string> cached_hardware_layouts_; 194 std::vector<std::string> cached_hardware_layouts_;
196 195
197 DISALLOW_COPY_AND_ASSIGN(InputMethodUtil); 196 DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
198 }; 197 };
199 198
200 } // namespace input_method 199 } // namespace input_method
201 } // namespace chromeos 200 } // namespace chromeos
202 201
203 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_ 202 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698