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

Side by Side Diff: ui/base/ime/chromeos/input_method_util.h

Issue 2829163004: Remove uses of base::hash_map from //chrome (Closed)
Patch Set: Downloads back Created 3 years, 5 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
« no previous file with comments | « chrome/renderer/tts_dispatcher.cc ('k') | ui/base/ime/chromeos/input_method_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_BASE_IME_CHROMEOS_INPUT_METHOD_UTIL_H_ 5 #ifndef UI_BASE_IME_CHROMEOS_INPUT_METHOD_UTIL_H_
6 #define UI_BASE_IME_CHROMEOS_INPUT_METHOD_UTIL_H_ 6 #define UI_BASE_IME_CHROMEOS_INPUT_METHOD_UTIL_H_
7 7
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/containers/hash_tables.h" 14 #include "base/containers/flat_map.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "base/threading/thread_checker.h" 17 #include "base/threading/thread_checker.h"
18 #include "ui/base/ime/chromeos/input_method_descriptor.h" 18 #include "ui/base/ime/chromeos/input_method_descriptor.h"
19 #include "ui/base/ime/ui_base_ime_export.h" 19 #include "ui/base/ime/ui_base_ime_export.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 namespace input_method { 22 namespace input_method {
23 23
24 class InputMethodDelegate; 24 class InputMethodDelegate;
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // name (e.g. 'US' instead of 'US keyboard'). 199 // name (e.g. 'US' instead of 'US keyboard').
200 base::string16 GetInputMethodLongNameInternal( 200 base::string16 GetInputMethodLongNameInternal(
201 const InputMethodDescriptor& input_method, bool short_name) const; 201 const InputMethodDescriptor& input_method, bool short_name) const;
202 202
203 // Map from language code to associated input method IDs, etc. 203 // Map from language code to associated input method IDs, etc.
204 typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap; 204 typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;
205 205
206 LanguageCodeToIdsMap language_code_to_ids_; 206 LanguageCodeToIdsMap language_code_to_ids_;
207 InputMethodIdToDescriptorMap id_to_descriptor_; 207 InputMethodIdToDescriptorMap id_to_descriptor_;
208 208
209 typedef base::hash_map<std::string, int> HashType; 209 using EnglishToIDMap = base::flat_map<std::string, int>;
210 HashType english_to_resource_id_; 210 EnglishToIDMap english_to_resource_id_;
211 211
212 InputMethodDelegate* delegate_; 212 InputMethodDelegate* delegate_;
213 213
214 base::ThreadChecker thread_checker_; 214 base::ThreadChecker thread_checker_;
215 std::vector<std::string> hardware_layouts_; 215 std::vector<std::string> hardware_layouts_;
216 std::vector<std::string> hardware_login_layouts_; 216 std::vector<std::string> hardware_login_layouts_;
217 std::vector<std::string> cached_hardware_layouts_; 217 std::vector<std::string> cached_hardware_layouts_;
218 218
219 DISALLOW_COPY_AND_ASSIGN(InputMethodUtil); 219 DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
220 }; 220 };
221 221
222 } // namespace input_method 222 } // namespace input_method
223 } // namespace chromeos 223 } // namespace chromeos
224 224
225 #endif // UI_BASE_IME_CHROMEOS_INPUT_METHOD_UTIL_H_ 225 #endif // UI_BASE_IME_CHROMEOS_INPUT_METHOD_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/renderer/tts_dispatcher.cc ('k') | ui/base/ime/chromeos/input_method_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698