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

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

Issue 10399046: Remove virtual keyboard support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 years, 7 months 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"
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 bool InputMethodManagerImpl::ContainOnlyKeyboardLayout( 574 bool InputMethodManagerImpl::ContainOnlyKeyboardLayout(
575 const std::vector<std::string>& value) { 575 const std::vector<std::string>& value) {
576 for (size_t i = 0; i < value.size(); ++i) { 576 for (size_t i = 0; i < value.size(); ++i) {
577 if (!InputMethodUtil::IsKeyboardLayout(value[i])) 577 if (!InputMethodUtil::IsKeyboardLayout(value[i]))
578 return false; 578 return false;
579 } 579 }
580 return true; 580 return true;
581 } 581 }
582 582
583 void InputMethodManagerImpl::MaybeInitializeCandidateWindowController() { 583 void InputMethodManagerImpl::MaybeInitializeCandidateWindowController() {
584 #if !defined(USE_VIRTUAL_KEYBOARD)
585 if (candidate_window_controller_.get()) 584 if (candidate_window_controller_.get())
586 return; 585 return;
587 586
588 candidate_window_controller_.reset( 587 candidate_window_controller_.reset(
589 CandidateWindowController::CreateCandidateWindowController()); 588 CandidateWindowController::CreateCandidateWindowController());
590 if (candidate_window_controller_->Init()) 589 if (candidate_window_controller_->Init())
591 candidate_window_controller_->AddObserver(this); 590 candidate_window_controller_->AddObserver(this);
592 else 591 else
593 DVLOG(1) << "Failed to initialize the candidate window controller"; 592 DVLOG(1) << "Failed to initialize the candidate window controller";
594 #endif
595 } 593 }
596 594
597 // static 595 // static
598 InputMethodManagerImpl* InputMethodManagerImpl::GetInstanceForTesting() { 596 InputMethodManagerImpl* InputMethodManagerImpl::GetInstanceForTesting() {
599 return new InputMethodManagerImpl; 597 return new InputMethodManagerImpl;
600 } 598 }
601 599
602 } // namespace input_method 600 } // namespace input_method
603 } // namespace chromeos 601 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698