| 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 <algorithm> // std::find | 7 #include <algorithm> // std::find |
| 8 | 8 |
| 9 #include "ash/ime/input_method_menu_item.h" | 9 #include "ash/ime/input_method_menu_item.h" |
| 10 #include "ash/ime/input_method_menu_manager.h" | 10 #include "ash/ime/input_method_menu_manager.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 container.end(); | 43 container.end(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace | 46 } // namespace |
| 47 | 47 |
| 48 bool InputMethodManagerImpl::IsLoginKeyboard( | 48 bool InputMethodManagerImpl::IsLoginKeyboard( |
| 49 const std::string& layout) const { | 49 const std::string& layout) const { |
| 50 return util_.IsLoginKeyboard(layout); | 50 return util_.IsLoginKeyboard(layout); |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool InputMethodManagerImpl::MigrateXkbInputMethods( |
| 54 std::vector<std::string>* input_method_ids) { |
| 55 return util_.MigrateXkbInputMethods(input_method_ids); |
| 56 } |
| 57 |
| 53 InputMethodManagerImpl::InputMethodManagerImpl( | 58 InputMethodManagerImpl::InputMethodManagerImpl( |
| 54 scoped_ptr<InputMethodDelegate> delegate) | 59 scoped_ptr<InputMethodDelegate> delegate) |
| 55 : delegate_(delegate.Pass()), | 60 : delegate_(delegate.Pass()), |
| 56 state_(STATE_LOGIN_SCREEN), | 61 state_(STATE_LOGIN_SCREEN), |
| 57 util_(delegate_.get(), GetSupportedInputMethods()), | 62 util_(delegate_.get(), GetSupportedInputMethods()), |
| 58 component_extension_ime_manager_(new ComponentExtensionIMEManager()), | 63 component_extension_ime_manager_(new ComponentExtensionIMEManager()), |
| 59 weak_ptr_factory_(this) { | 64 weak_ptr_factory_(this) { |
| 60 } | 65 } |
| 61 | 66 |
| 62 InputMethodManagerImpl::~InputMethodManagerImpl() { | 67 InputMethodManagerImpl::~InputMethodManagerImpl() { |
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 835 if (candidate_window_controller_.get()) | 840 if (candidate_window_controller_.get()) |
| 836 return; | 841 return; |
| 837 | 842 |
| 838 candidate_window_controller_.reset( | 843 candidate_window_controller_.reset( |
| 839 CandidateWindowController::CreateCandidateWindowController()); | 844 CandidateWindowController::CreateCandidateWindowController()); |
| 840 candidate_window_controller_->AddObserver(this); | 845 candidate_window_controller_->AddObserver(this); |
| 841 } | 846 } |
| 842 | 847 |
| 843 } // namespace input_method | 848 } // namespace input_method |
| 844 } // namespace chromeos | 849 } // namespace chromeos |
| OLD | NEW |