OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/webui/chromeos/login/l10n_util.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <iterator> | 9 #include <iterator> |
10 #include <map> | 10 #include <map> |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "base/strings/string16.h" | 23 #include "base/strings/string16.h" |
24 #include "base/strings/stringprintf.h" | 24 #include "base/strings/stringprintf.h" |
25 #include "base/strings/utf_string_conversions.h" | 25 #include "base/strings/utf_string_conversions.h" |
26 #include "base/task_runner_util.h" | 26 #include "base/task_runner_util.h" |
27 #include "base/task_scheduler/post_task.h" | 27 #include "base/task_scheduler/post_task.h" |
28 #include "base/threading/sequenced_task_runner_handle.h" | 28 #include "base/threading/sequenced_task_runner_handle.h" |
29 #include "base/threading/thread_restrictions.h" | 29 #include "base/threading/thread_restrictions.h" |
30 #include "base/values.h" | 30 #include "base/values.h" |
31 #include "chrome/browser/browser_process.h" | 31 #include "chrome/browser/browser_process.h" |
32 #include "chrome/browser/chromeos/customization/customization_document.h" | 32 #include "chrome/browser/chromeos/customization/customization_document.h" |
33 #include "chrome/browser/chromeos/input_method/input_method_util.h" | |
34 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 33 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
35 #include "chrome/browser/profiles/profile_manager.h" | 34 #include "chrome/browser/profiles/profile_manager.h" |
36 #include "chrome/grit/generated_resources.h" | 35 #include "chrome/grit/generated_resources.h" |
37 #include "content/public/browser/browser_thread.h" | 36 #include "content/public/browser/browser_thread.h" |
38 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" | 37 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" |
39 #include "ui/base/ime/chromeos/input_method_descriptor.h" | 38 #include "ui/base/ime/chromeos/input_method_descriptor.h" |
40 #include "ui/base/ime/chromeos/input_method_manager.h" | 39 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 40 #include "ui/base/ime/chromeos/input_method_util.h" |
41 #include "ui/base/l10n/l10n_util.h" | 41 #include "ui/base/l10n/l10n_util.h" |
42 | 42 |
43 namespace chromeos { | 43 namespace chromeos { |
44 | 44 |
45 const char kMostRelevantLanguagesDivider[] = "MOST_RELEVANT_LANGUAGES_DIVIDER"; | 45 const char kMostRelevantLanguagesDivider[] = "MOST_RELEVANT_LANGUAGES_DIVIDER"; |
46 | 46 |
47 namespace { | 47 namespace { |
48 | 48 |
49 std::unique_ptr<base::DictionaryValue> CreateInputMethodsEntry( | 49 std::unique_ptr<base::DictionaryValue> CreateInputMethodsEntry( |
50 const input_method::InputMethodDescriptor& method, | 50 const input_method::InputMethodDescriptor& method, |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 std::unique_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() { | 592 std::unique_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() { |
593 const input_method::InputMethodDescriptor current_input_method = | 593 const input_method::InputMethodDescriptor current_input_method = |
594 input_method::InputMethodManager::Get() | 594 input_method::InputMethodManager::Get() |
595 ->GetActiveIMEState() | 595 ->GetActiveIMEState() |
596 ->GetCurrentInputMethod(); | 596 ->GetCurrentInputMethod(); |
597 return CreateInputMethodsEntry(current_input_method, | 597 return CreateInputMethodsEntry(current_input_method, |
598 current_input_method.id()); | 598 current_input_method.id()); |
599 } | 599 } |
600 | 600 |
601 } // namespace chromeos | 601 } // namespace chromeos |
OLD | NEW |