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 <map> | 8 #include <map> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "unicode/uloc.h" | 11 #include "unicode/uloc.h" |
12 | 12 |
13 #include "app/l10n_util.h" | 13 #include "app/l10n_util.h" |
14 #include "app/l10n_util_collator.h" | 14 #include "app/l10n_util_collator.h" |
15 #include "base/basictypes.h" | 15 #include "base/basictypes.h" |
16 #include "base/hash_tables.h" | 16 #include "base/hash_tables.h" |
17 #include "base/scoped_ptr.h" | 17 #include "base/scoped_ptr.h" |
18 #include "base/singleton.h" | 18 #include "base/singleton.h" |
| 19 #include "base/string_split.h" |
19 #include "base/string_util.h" | 20 #include "base/string_util.h" |
20 #include "base/utf_string_conversions.h" | 21 #include "base/utf_string_conversions.h" |
21 #include "chrome/browser/browser_process.h" | 22 #include "chrome/browser/browser_process.h" |
22 #include "chrome/browser/chrome_thread.h" | 23 #include "chrome/browser/chrome_thread.h" |
23 #include "chrome/browser/chromeos/cros/cros_library.h" | 24 #include "chrome/browser/chromeos/cros/cros_library.h" |
24 #include "chrome/browser/chromeos/cros/keyboard_library.h" | 25 #include "chrome/browser/chromeos/cros/keyboard_library.h" |
25 #include "chrome/browser/chromeos/language_preferences.h" | 26 #include "chrome/browser/chromeos/language_preferences.h" |
26 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
27 | 28 |
28 namespace { | 29 namespace { |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 library->ChangeInputMethod(initial_input_method_id); | 591 library->ChangeInputMethod(initial_input_method_id); |
591 } | 592 } |
592 } | 593 } |
593 | 594 |
594 void OnLocaleChanged() { | 595 void OnLocaleChanged() { |
595 Singleton<IdMaps>::get()->ReloadMaps(); | 596 Singleton<IdMaps>::get()->ReloadMaps(); |
596 } | 597 } |
597 | 598 |
598 } // namespace input_method | 599 } // namespace input_method |
599 } // namespace chromeos | 600 } // namespace chromeos |
OLD | NEW |