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

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

Issue 187313002: Update StickyKeys overlay to show or hide AltGr depending on the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix rebase Created 6 years, 9 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 "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 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 ChangeInputMethodInternal(*iter, true); 708 ChangeInputMethodInternal(*iter, true);
709 } 709 }
710 710
711 InputMethodDescriptor InputMethodManagerImpl::GetCurrentInputMethod() const { 711 InputMethodDescriptor InputMethodManagerImpl::GetCurrentInputMethod() const {
712 if (current_input_method_.id().empty()) 712 if (current_input_method_.id().empty())
713 return InputMethodUtil::GetFallbackInputMethodDescriptor(); 713 return InputMethodUtil::GetFallbackInputMethodDescriptor();
714 714
715 return current_input_method_; 715 return current_input_method_;
716 } 716 }
717 717
718 bool InputMethodManagerImpl::IsISOLevel5ShiftUsedByCurrentInputMethod() const {
719 return xkeyboard_->IsISOLevel5ShiftAvailable();
720 }
721
722 bool InputMethodManagerImpl::IsAltGrUsedByCurrentInputMethod() const {
723 return xkeyboard_->IsAltGrAvailable();
724 }
725
718 XKeyboard* InputMethodManagerImpl::GetXKeyboard() { 726 XKeyboard* InputMethodManagerImpl::GetXKeyboard() {
719 return xkeyboard_.get(); 727 return xkeyboard_.get();
720 } 728 }
721 729
722 InputMethodUtil* InputMethodManagerImpl::GetInputMethodUtil() { 730 InputMethodUtil* InputMethodManagerImpl::GetInputMethodUtil() {
723 return &util_; 731 return &util_;
724 } 732 }
725 733
726 ComponentExtensionIMEManager* 734 ComponentExtensionIMEManager*
727 InputMethodManagerImpl::GetComponentExtensionIMEManager() { 735 InputMethodManagerImpl::GetComponentExtensionIMEManager() {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 if (candidate_window_controller_.get()) 849 if (candidate_window_controller_.get())
842 return; 850 return;
843 851
844 candidate_window_controller_.reset( 852 candidate_window_controller_.reset(
845 CandidateWindowController::CreateCandidateWindowController()); 853 CandidateWindowController::CreateCandidateWindowController());
846 candidate_window_controller_->AddObserver(this); 854 candidate_window_controller_->AddObserver(this);
847 } 855 }
848 856
849 } // namespace input_method 857 } // namespace input_method
850 } // namespace chromeos 858 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698