Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1223)

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 11594008: Revert 173477 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
12 #include "base/string_util.h" 11 #include "base/string_util.h"
13 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
14 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 13 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
15 #include "chrome/browser/chromeos/input_method/input_method_delegate.h" 14 #include "chrome/browser/chromeos/input_method/input_method_delegate.h"
16 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" 15 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
17 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 16 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
18 #include "chrome/browser/chromeos/language_preferences.h" 17 #include "chrome/browser/chromeos/language_preferences.h"
19 #include "ui/base/accelerators/accelerator.h" 18 #include "ui/base/accelerators/accelerator.h"
20 #include "unicode/uloc.h" 19 #include "unicode/uloc.h"
21 20
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 ite != extra_input_method_instances_.end(); 572 ite != extra_input_method_instances_.end();
574 ite++) { 573 ite++) {
575 if (!Contains(filtered_extension_imes_, ite->first)) 574 if (!Contains(filtered_extension_imes_, ite->first))
576 ite->second->OnDisconnected(); 575 ite->second->OnDisconnected();
577 } 576 }
578 } 577 }
579 578
580 void InputMethodManagerImpl::Init() { 579 void InputMethodManagerImpl::Init() {
581 DCHECK(!ibus_controller_.get()); 580 DCHECK(!ibus_controller_.get());
582 581
583 ibus_controller_.reset(IBusController::Create( 582 ibus_controller_.reset(IBusController::Create());
584 delegate_->GetDefaultTaskRunner(), delegate_->GetWorkerTaskRunner())); 583 xkeyboard_.reset(XKeyboard::Create(util_));
585 xkeyboard_.reset(XKeyboard::Create(util_, delegate_->GetDefaultTaskRunner()));
586 ibus_controller_->AddObserver(this); 584 ibus_controller_->AddObserver(this);
587 } 585 }
588 586
589 void InputMethodManagerImpl::SetIBusControllerForTesting( 587 void InputMethodManagerImpl::SetIBusControllerForTesting(
590 IBusController* ibus_controller) { 588 IBusController* ibus_controller) {
591 ibus_controller_.reset(ibus_controller); 589 ibus_controller_.reset(ibus_controller);
592 ibus_controller_->AddObserver(this); 590 ibus_controller_->AddObserver(this);
593 } 591 }
594 592
595 void InputMethodManagerImpl::SetCandidateWindowControllerForTesting( 593 void InputMethodManagerImpl::SetCandidateWindowControllerForTesting(
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 candidate_window_controller_.reset( 676 candidate_window_controller_.reset(
679 CandidateWindowController::CreateCandidateWindowController()); 677 CandidateWindowController::CreateCandidateWindowController());
680 if (candidate_window_controller_->Init(ibus_controller_.get())) 678 if (candidate_window_controller_->Init(ibus_controller_.get()))
681 candidate_window_controller_->AddObserver(this); 679 candidate_window_controller_->AddObserver(this);
682 else 680 else
683 DVLOG(1) << "Failed to initialize the candidate window controller"; 681 DVLOG(1) << "Failed to initialize the candidate window controller";
684 } 682 }
685 683
686 } // namespace input_method 684 } // namespace input_method
687 } // namespace chromeos 685 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698