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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "base/strings/utf_string_conversions.h" | 22 #include "base/strings/utf_string_conversions.h" |
23 #include "base/task_runner_util.h" | 23 #include "base/task_runner_util.h" |
24 #include "base/threading/sequenced_worker_pool.h" | 24 #include "base/threading/sequenced_worker_pool.h" |
25 #include "base/values.h" | 25 #include "base/values.h" |
26 #include "chrome/browser/browser_process.h" | 26 #include "chrome/browser/browser_process.h" |
27 #include "chrome/browser/chromeos/customization_document.h" | 27 #include "chrome/browser/chromeos/customization_document.h" |
28 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 28 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
29 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 29 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
30 #include "chrome/browser/profiles/profile_manager.h" | 30 #include "chrome/browser/profiles/profile_manager.h" |
31 #include "chrome/grit/generated_resources.h" | 31 #include "chrome/grit/generated_resources.h" |
| 32 #include "chromeos/ime/component_extension_ime_manager.h" |
| 33 #include "chromeos/ime/input_method_descriptor.h" |
| 34 #include "chromeos/ime/input_method_manager.h" |
32 #include "content/public/browser/browser_thread.h" | 35 #include "content/public/browser/browser_thread.h" |
33 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" | |
34 #include "ui/base/ime/chromeos/input_method_descriptor.h" | |
35 #include "ui/base/ime/chromeos/input_method_manager.h" | |
36 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
37 | 37 |
38 namespace chromeos { | 38 namespace chromeos { |
39 | 39 |
40 const char kMostRelevantLanguagesDivider[] = "MOST_RELEVANT_LANGUAGES_DIVIDER"; | 40 const char kMostRelevantLanguagesDivider[] = "MOST_RELEVANT_LANGUAGES_DIVIDER"; |
41 | 41 |
42 namespace { | 42 namespace { |
43 | 43 |
44 const char kSequenceToken[] = "chromeos_login_l10n_util"; | 44 const char kSequenceToken[] = "chromeos_login_l10n_util"; |
45 | 45 |
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 scoped_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() { | 619 scoped_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() { |
620 const input_method::InputMethodDescriptor current_input_method = | 620 const input_method::InputMethodDescriptor current_input_method = |
621 input_method::InputMethodManager::Get() | 621 input_method::InputMethodManager::Get() |
622 ->GetActiveIMEState() | 622 ->GetActiveIMEState() |
623 ->GetCurrentInputMethod(); | 623 ->GetCurrentInputMethod(); |
624 return CreateInputMethodsEntry(current_input_method, | 624 return CreateInputMethodsEntry(current_input_method, |
625 current_input_method.id()); | 625 current_input_method.id()); |
626 } | 626 } |
627 | 627 |
628 } // namespace chromeos | 628 } // namespace chromeos |
OLD | NEW |