OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <functional> |
8 #include <map> | 9 #include <map> |
9 #include <utility> | 10 #include <utility> |
10 | 11 |
11 #include "unicode/uloc.h" | 12 #include "unicode/uloc.h" |
12 | 13 |
13 #include "app/l10n_util.h" | 14 #include "app/l10n_util.h" |
14 #include "app/l10n_util_collator.h" | 15 #include "app/l10n_util_collator.h" |
15 #include "base/basictypes.h" | 16 #include "base/basictypes.h" |
16 #include "base/hash_tables.h" | 17 #include "base/hash_tables.h" |
17 #include "base/scoped_ptr.h" | 18 #include "base/scoped_ptr.h" |
18 #include "base/singleton.h" | 19 #include "base/singleton.h" |
19 #include "base/string_split.h" | 20 #include "base/string_split.h" |
20 #include "base/string_util.h" | 21 #include "base/string_util.h" |
21 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
22 #include "chrome/browser/browser_process.h" | 23 #include "chrome/browser/browser_process.h" |
23 #include "chrome/browser/browser_thread.h" | |
24 #include "chrome/browser/chromeos/cros/cros_library.h" | 24 #include "chrome/browser/chromeos/cros/cros_library.h" |
25 #include "chrome/browser/chromeos/cros/keyboard_library.h" | 25 #include "chrome/browser/chromeos/cros/keyboard_library.h" |
26 #include "chrome/browser/chromeos/language_preferences.h" | 26 #include "chrome/browser/chromeos/language_preferences.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 | 28 |
29 namespace { | 29 namespace { |
30 | 30 |
31 // Mapping from input method ID to keyboard overlay ID, which specifies the | 31 // Mapping from input method ID to keyboard overlay ID, which specifies the |
32 // layout and the glyphs of the keyboard overlay. | 32 // layout and the glyphs of the keyboard overlay. |
33 // TODO(mazda): Move this list to whitelist.txt (http://crosbug.com/9682) | 33 // TODO(mazda): Move this list to whitelist.txt (http://crosbug.com/9682) |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 library->ChangeInputMethod(initial_input_method_id); | 690 library->ChangeInputMethod(initial_input_method_id); |
691 } | 691 } |
692 } | 692 } |
693 | 693 |
694 void OnLocaleChanged() { | 694 void OnLocaleChanged() { |
695 IdMaps::GetInstance()->ReloadMaps(); | 695 IdMaps::GetInstance()->ReloadMaps(); |
696 } | 696 } |
697 | 697 |
698 } // namespace input_method | 698 } // namespace input_method |
699 } // namespace chromeos | 699 } // namespace chromeos |
OLD | NEW |