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

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

Issue 9653027: Fix ui::VKEY_HANGUL handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.h" 5 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include <glib.h> 9 #include <glib.h>
10 10
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 input_method_ids_to_switch.push_back("mozc-jp"); 663 input_method_ids_to_switch.push_back("mozc-jp");
664 break; 664 break;
665 case ui::VKEY_NONCONVERT: // Muhenkan key on JP106 keyboard 665 case ui::VKEY_NONCONVERT: // Muhenkan key on JP106 keyboard
666 input_method_ids_to_switch.push_back("xkb:jp::jpn"); 666 input_method_ids_to_switch.push_back("xkb:jp::jpn");
667 break; 667 break;
668 case ui::VKEY_DBE_SBCSCHAR: // ZenkakuHankaku key on JP106 keyboard 668 case ui::VKEY_DBE_SBCSCHAR: // ZenkakuHankaku key on JP106 keyboard
669 case ui::VKEY_DBE_DBCSCHAR: 669 case ui::VKEY_DBE_DBCSCHAR:
670 input_method_ids_to_switch.push_back("mozc-jp"); 670 input_method_ids_to_switch.push_back("mozc-jp");
671 input_method_ids_to_switch.push_back("xkb:jp::jpn"); 671 input_method_ids_to_switch.push_back("xkb:jp::jpn");
672 break; 672 break;
673 case ui::VKEY_HANGUL: 673 case ui::VKEY_HANGUL: // Hangul (or right Alt) key on Korean keyboard
674 input_method_ids_to_switch.push_back("mozc-hangul");
675 break;
676 case ui::VKEY_SPACE: // Shift+Space 674 case ui::VKEY_SPACE: // Shift+Space
677 input_method_ids_to_switch.push_back("mozc-hangul"); 675 input_method_ids_to_switch.push_back("mozc-hangul");
678 input_method_ids_to_switch.push_back("xkb:kr:kr104:kor"); 676 input_method_ids_to_switch.push_back("xkb:kr:kr104:kor");
679 break; 677 break;
680 default: 678 default:
681 NOTREACHED(); 679 NOTREACHED();
682 break; 680 break;
683 } 681 }
684 if (input_method_ids_to_switch.empty()) { 682 if (input_method_ids_to_switch.empty()) {
685 LOG(ERROR) << "Unexpected VKEY: " << accelerator.key_code(); 683 LOG(ERROR) << "Unexpected VKEY: " << accelerator.key_code();
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl); 1542 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
1545 }; 1543 };
1546 1544
1547 // static 1545 // static
1548 InputMethodManager* InputMethodManager::GetInstance() { 1546 InputMethodManager* InputMethodManager::GetInstance() {
1549 return InputMethodManagerImpl::GetInstance(); 1547 return InputMethodManagerImpl::GetInstance();
1550 } 1548 }
1551 1549
1552 } // namespace input_method 1550 } // namespace input_method
1553 } // namespace chromeos 1551 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698