| 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 "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/sequenced_task_runner.h" |
| 11 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 12 #include "base/stringprintf.h" | 13 #include "base/stringprintf.h" |
| 13 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" | 14 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" |
| 14 #include "chrome/browser/chromeos/input_method/input_method_delegate.h" | 15 #include "chrome/browser/chromeos/input_method/input_method_delegate.h" |
| 15 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" | 16 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" |
| 16 #include "chrome/browser/chromeos/input_method/xkeyboard.h" | 17 #include "chrome/browser/chromeos/input_method/xkeyboard.h" |
| 17 #include "chrome/browser/chromeos/language_preferences.h" | 18 #include "chrome/browser/chromeos/language_preferences.h" |
| 18 #include "ui/base/accelerators/accelerator.h" | 19 #include "ui/base/accelerators/accelerator.h" |
| 19 #include "unicode/uloc.h" | 20 #include "unicode/uloc.h" |
| 20 | 21 |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 ite != extra_input_method_instances_.end(); | 573 ite != extra_input_method_instances_.end(); |
| 573 ite++) { | 574 ite++) { |
| 574 if (!Contains(filtered_extension_imes_, ite->first)) | 575 if (!Contains(filtered_extension_imes_, ite->first)) |
| 575 ite->second->OnDisconnected(); | 576 ite->second->OnDisconnected(); |
| 576 } | 577 } |
| 577 } | 578 } |
| 578 | 579 |
| 579 void InputMethodManagerImpl::Init() { | 580 void InputMethodManagerImpl::Init() { |
| 580 DCHECK(!ibus_controller_.get()); | 581 DCHECK(!ibus_controller_.get()); |
| 581 | 582 |
| 582 ibus_controller_.reset(IBusController::Create()); | 583 ibus_controller_.reset(IBusController::Create( |
| 583 xkeyboard_.reset(XKeyboard::Create(util_)); | 584 delegate_->GetDefaultTaskRunner(), delegate_->GetWorkerTaskRunner())); |
| 585 xkeyboard_.reset(XKeyboard::Create(util_, delegate_->GetDefaultTaskRunner())); |
| 584 ibus_controller_->AddObserver(this); | 586 ibus_controller_->AddObserver(this); |
| 585 } | 587 } |
| 586 | 588 |
| 587 void InputMethodManagerImpl::SetIBusControllerForTesting( | 589 void InputMethodManagerImpl::SetIBusControllerForTesting( |
| 588 IBusController* ibus_controller) { | 590 IBusController* ibus_controller) { |
| 589 ibus_controller_.reset(ibus_controller); | 591 ibus_controller_.reset(ibus_controller); |
| 590 ibus_controller_->AddObserver(this); | 592 ibus_controller_->AddObserver(this); |
| 591 } | 593 } |
| 592 | 594 |
| 593 void InputMethodManagerImpl::SetCandidateWindowControllerForTesting( | 595 void InputMethodManagerImpl::SetCandidateWindowControllerForTesting( |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 candidate_window_controller_.reset( | 678 candidate_window_controller_.reset( |
| 677 CandidateWindowController::CreateCandidateWindowController()); | 679 CandidateWindowController::CreateCandidateWindowController()); |
| 678 if (candidate_window_controller_->Init(ibus_controller_.get())) | 680 if (candidate_window_controller_->Init(ibus_controller_.get())) |
| 679 candidate_window_controller_->AddObserver(this); | 681 candidate_window_controller_->AddObserver(this); |
| 680 else | 682 else |
| 681 DVLOG(1) << "Failed to initialize the candidate window controller"; | 683 DVLOG(1) << "Failed to initialize the candidate window controller"; |
| 682 } | 684 } |
| 683 | 685 |
| 684 } // namespace input_method | 686 } // namespace input_method |
| 685 } // namespace chromeos | 687 } // namespace chromeos |
| OLD | NEW |