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_manager_impl.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <algorithm> // std::find | 9 #include <algorithm> // std::find |
10 #include <memory> | 10 #include <memory> |
| 11 #include <set> |
11 #include <sstream> | 12 #include <sstream> |
12 #include <utility> | 13 #include <utility> |
13 | 14 |
14 #include "base/bind.h" | 15 #include "base/bind.h" |
15 #include "base/hash.h" | 16 #include "base/hash.h" |
16 #include "base/location.h" | 17 #include "base/location.h" |
17 #include "base/metrics/histogram.h" | 18 #include "base/metrics/histogram.h" |
18 #include "base/metrics/sparse_histogram.h" | 19 #include "base/metrics/sparse_histogram.h" |
19 #include "base/strings/string_split.h" | 20 #include "base/strings/string_split.h" |
20 #include "base/strings/string_util.h" | 21 #include "base/strings/string_util.h" |
21 #include "base/strings/stringprintf.h" | 22 #include "base/strings/stringprintf.h" |
22 #include "base/sys_info.h" | 23 #include "base/sys_info.h" |
23 #include "chrome/browser/browser_process.h" | 24 #include "chrome/browser/browser_process.h" |
24 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" | 25 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" |
25 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i
mpl.h" | 26 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i
mpl.h" |
26 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h" | 27 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h" |
27 #include "chrome/browser/chromeos/language_preferences.h" | 28 #include "chrome/browser/chromeos/language_preferences.h" |
28 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 29 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
29 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 30 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
30 #include "chrome/browser/profiles/profile_manager.h" | 31 #include "chrome/browser/profiles/profile_manager.h" |
| 32 #include "chrome/browser/ui/ash/ash_util.h" |
31 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
32 #include "components/prefs/pref_service.h" | 34 #include "components/prefs/pref_service.h" |
33 #include "components/user_manager/user_manager.h" | 35 #include "components/user_manager/user_manager.h" |
34 #include "third_party/icu/source/common/unicode/uloc.h" | 36 #include "third_party/icu/source/common/unicode/uloc.h" |
35 #include "ui/base/accelerators/accelerator.h" | 37 #include "ui/base/accelerators/accelerator.h" |
36 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" | 38 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" |
37 #include "ui/base/ime/chromeos/extension_ime_util.h" | 39 #include "ui/base/ime/chromeos/extension_ime_util.h" |
38 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" | 40 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" |
39 #include "ui/base/ime/chromeos/ime_keyboard.h" | 41 #include "ui/base/ime/chromeos/ime_keyboard.h" |
40 #include "ui/base/ime/chromeos/input_method_delegate.h" | 42 #include "ui/base/ime/chromeos/input_method_delegate.h" |
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
848 InputMethodManagerImpl::InputMethodManagerImpl( | 850 InputMethodManagerImpl::InputMethodManagerImpl( |
849 std::unique_ptr<InputMethodDelegate> delegate, | 851 std::unique_ptr<InputMethodDelegate> delegate, |
850 bool enable_extension_loading) | 852 bool enable_extension_loading) |
851 : delegate_(std::move(delegate)), | 853 : delegate_(std::move(delegate)), |
852 ui_session_(STATE_LOGIN_SCREEN), | 854 ui_session_(STATE_LOGIN_SCREEN), |
853 state_(NULL), | 855 state_(NULL), |
854 util_(delegate_.get()), | 856 util_(delegate_.get()), |
855 component_extension_ime_manager_(new ComponentExtensionIMEManager()), | 857 component_extension_ime_manager_(new ComponentExtensionIMEManager()), |
856 enable_extension_loading_(enable_extension_loading), | 858 enable_extension_loading_(enable_extension_loading), |
857 is_ime_menu_activated_(false) { | 859 is_ime_menu_activated_(false) { |
858 if (base::SysInfo::IsRunningOnChromeOS()) | 860 // TODO(mohsen): Revisit using FakeImeKeyboard with mash when InputController |
| 861 // work is ready. http://crbug.com/601981 |
| 862 if (base::SysInfo::IsRunningOnChromeOS() && !chrome::IsRunningInMash()) |
859 keyboard_.reset(ImeKeyboard::Create()); | 863 keyboard_.reset(ImeKeyboard::Create()); |
860 else | 864 else |
861 keyboard_.reset(new FakeImeKeyboard()); | 865 keyboard_.reset(new FakeImeKeyboard()); |
862 | 866 |
863 // Initializes the system IME list. | 867 // Initializes the system IME list. |
864 std::unique_ptr<ComponentExtensionIMEManagerDelegate> comp_delegate( | 868 std::unique_ptr<ComponentExtensionIMEManagerDelegate> comp_delegate( |
865 new ComponentExtensionIMEManagerImpl()); | 869 new ComponentExtensionIMEManagerImpl()); |
866 component_extension_ime_manager_->Initialize(std::move(comp_delegate)); | 870 component_extension_ime_manager_->Initialize(std::move(comp_delegate)); |
867 const InputMethodDescriptors& descriptors = | 871 const InputMethodDescriptors& descriptors = |
868 component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor(); | 872 component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor(); |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1203 | 1207 |
1204 void InputMethodManagerImpl::NotifyImeMenuItemsChanged( | 1208 void InputMethodManagerImpl::NotifyImeMenuItemsChanged( |
1205 const std::string& engine_id, | 1209 const std::string& engine_id, |
1206 const std::vector<InputMethodManager::MenuItem>& items) { | 1210 const std::vector<InputMethodManager::MenuItem>& items) { |
1207 FOR_EACH_OBSERVER(InputMethodManager::ImeMenuObserver, ime_menu_observers_, | 1211 FOR_EACH_OBSERVER(InputMethodManager::ImeMenuObserver, ime_menu_observers_, |
1208 ImeMenuItemsChanged(engine_id, items)); | 1212 ImeMenuItemsChanged(engine_id, items)); |
1209 } | 1213 } |
1210 | 1214 |
1211 } // namespace input_method | 1215 } // namespace input_method |
1212 } // namespace chromeos | 1216 } // namespace chromeos |
OLD | NEW |