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> | 7 #include <algorithm> |
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 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
882 ui::Accelerator keyup_accelerator(ui::VKEY_SPACE, ui::EF_CONTROL_DOWN); | 882 ui::Accelerator keyup_accelerator(ui::VKEY_SPACE, ui::EF_CONTROL_DOWN); |
883 keyup_accelerator.set_type(ui::ET_KEY_RELEASED); | 883 keyup_accelerator.set_type(ui::ET_KEY_RELEASED); |
884 | 884 |
885 std::vector<std::string> keyboard_layouts; | 885 std::vector<std::string> keyboard_layouts; |
886 keyboard_layouts.push_back(ImeIdFromEngineId("xkb:us::eng")); | 886 keyboard_layouts.push_back(ImeIdFromEngineId("xkb:us::eng")); |
887 manager_->EnableLoginLayouts("en-US", keyboard_layouts); | 887 manager_->EnableLoginLayouts("en-US", keyboard_layouts); |
888 EXPECT_EQ(5U, manager_->GetNumActiveInputMethods()); | 888 EXPECT_EQ(5U, manager_->GetNumActiveInputMethods()); |
889 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), | 889 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), |
890 manager_->GetCurrentInputMethod().id()); | 890 manager_->GetCurrentInputMethod().id()); |
891 EXPECT_EQ("us", keyboard_->last_layout_); | 891 EXPECT_EQ("us", keyboard_->last_layout_); |
892 EXPECT_TRUE(manager_->SwitchToNextInputMethod()); | 892 manager_->SwitchToNextInputMethod(); |
893 EXPECT_TRUE(observer.last_show_message_); | 893 EXPECT_TRUE(observer.last_show_message_); |
894 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), | 894 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), |
895 manager_->GetCurrentInputMethod().id()); | 895 manager_->GetCurrentInputMethod().id()); |
896 EXPECT_EQ("us(intl)", keyboard_->last_layout_); | 896 EXPECT_EQ("us(intl)", keyboard_->last_layout_); |
897 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); | 897 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); |
898 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); | 898 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); |
899 EXPECT_TRUE(observer.last_show_message_); | 899 EXPECT_TRUE(observer.last_show_message_); |
900 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), | 900 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), |
901 manager_->GetCurrentInputMethod().id()); | 901 manager_->GetCurrentInputMethod().id()); |
902 EXPECT_EQ("us", keyboard_->last_layout_); | 902 EXPECT_EQ("us", keyboard_->last_layout_); |
903 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); | 903 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); |
904 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); | 904 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); |
905 EXPECT_TRUE(observer.last_show_message_); | 905 EXPECT_TRUE(observer.last_show_message_); |
906 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), | 906 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), |
907 manager_->GetCurrentInputMethod().id()); | 907 manager_->GetCurrentInputMethod().id()); |
908 EXPECT_EQ("us(intl)", keyboard_->last_layout_); | 908 EXPECT_EQ("us(intl)", keyboard_->last_layout_); |
909 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); | 909 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); |
910 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); | 910 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); |
911 EXPECT_TRUE(observer.last_show_message_); | 911 EXPECT_TRUE(observer.last_show_message_); |
912 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), | 912 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), |
913 manager_->GetCurrentInputMethod().id()); | 913 manager_->GetCurrentInputMethod().id()); |
914 EXPECT_EQ("us", keyboard_->last_layout_); | 914 EXPECT_EQ("us", keyboard_->last_layout_); |
915 EXPECT_TRUE(manager_->SwitchToNextInputMethod()); | 915 manager_->SwitchToNextInputMethod(); |
916 EXPECT_TRUE(observer.last_show_message_); | 916 EXPECT_TRUE(observer.last_show_message_); |
917 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), | 917 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), |
918 manager_->GetCurrentInputMethod().id()); | 918 manager_->GetCurrentInputMethod().id()); |
919 EXPECT_EQ("us(intl)", keyboard_->last_layout_); | 919 EXPECT_EQ("us(intl)", keyboard_->last_layout_); |
920 EXPECT_TRUE(manager_->SwitchToNextInputMethod()); | 920 manager_->SwitchToNextInputMethod(); |
921 EXPECT_TRUE(observer.last_show_message_); | 921 EXPECT_TRUE(observer.last_show_message_); |
922 EXPECT_EQ(ImeIdFromEngineId("xkb:us:altgr-intl:eng"), | 922 EXPECT_EQ(ImeIdFromEngineId("xkb:us:altgr-intl:eng"), |
923 manager_->GetCurrentInputMethod().id()); | 923 manager_->GetCurrentInputMethod().id()); |
924 EXPECT_EQ("us(altgr-intl)", keyboard_->last_layout_); | 924 EXPECT_EQ("us(altgr-intl)", keyboard_->last_layout_); |
925 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); | 925 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator)); |
926 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); | 926 EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator)); |
927 EXPECT_TRUE(observer.last_show_message_); | 927 EXPECT_TRUE(observer.last_show_message_); |
928 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), | 928 EXPECT_EQ(ImeIdFromEngineId("xkb:us:intl:eng"), |
929 manager_->GetCurrentInputMethod().id()); | 929 manager_->GetCurrentInputMethod().id()); |
930 EXPECT_EQ("us(intl)", keyboard_->last_layout_); | 930 EXPECT_EQ("us(intl)", keyboard_->last_layout_); |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1366 ASSERT_EQ(4U, input_method_ids.size()); | 1366 ASSERT_EQ(4U, input_method_ids.size()); |
1367 | 1367 |
1368 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), input_method_ids[0]); | 1368 EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), input_method_ids[0]); |
1369 EXPECT_EQ(ImeIdFromEngineId("xkb:fr::fra"), input_method_ids[1]); | 1369 EXPECT_EQ(ImeIdFromEngineId("xkb:fr::fra"), input_method_ids[1]); |
1370 EXPECT_EQ("_comp_ime_asdf_pinyin", input_method_ids[2]); | 1370 EXPECT_EQ("_comp_ime_asdf_pinyin", input_method_ids[2]); |
1371 EXPECT_EQ(ImeIdFromEngineId("zh-t-i0-pinyin"), input_method_ids[3]); | 1371 EXPECT_EQ(ImeIdFromEngineId("zh-t-i0-pinyin"), input_method_ids[3]); |
1372 } | 1372 } |
1373 | 1373 |
1374 } // namespace input_method | 1374 } // namespace input_method |
1375 } // namespace chromeos | 1375 } // namespace chromeos |
OLD | NEW |