| OLD | NEW |
| 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 #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 <functional> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/string_split.h" | 14 #include "base/string_split.h" |
| 15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
| 16 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
| 17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 18 #include "chrome/browser/chromeos/language_preferences.h" | |
| 19 #include "chrome/browser/prefs/pref_service.h" | 18 #include "chrome/browser/prefs/pref_service.h" |
| 20 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
| 21 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
| 22 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
| 23 #include "ui/base/l10n/l10n_util_collator.h" | 22 #include "ui/base/l10n/l10n_util_collator.h" |
| 24 #include "unicode/uloc.h" | 23 #include "unicode/uloc.h" |
| 25 | 24 |
| 26 namespace { | 25 namespace { |
| 27 | 26 |
| 28 // A mapping from an input method id to a string for the language indicator. The | 27 // A mapping from an input method id to a string for the language indicator. The |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 ReloadInternalMaps(); | 688 ReloadInternalMaps(); |
| 690 } | 689 } |
| 691 | 690 |
| 692 void InputMethodUtil::SetHardwareInputMethodIdForTesting( | 691 void InputMethodUtil::SetHardwareInputMethodIdForTesting( |
| 693 const std::string& input_method_id) { | 692 const std::string& input_method_id) { |
| 694 hardware_input_method_id_for_testing_ = input_method_id; | 693 hardware_input_method_id_for_testing_ = input_method_id; |
| 695 } | 694 } |
| 696 | 695 |
| 697 } // namespace input_method | 696 } // namespace input_method |
| 698 } // namespace chromeos | 697 } // namespace chromeos |
| OLD | NEW |