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

Side by Side Diff: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc

Issue 885703002: ozone: Fix chromium-style method override warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 #include "ui/events/event_constants.h" 6 #include "ui/events/event_constants.h"
7 #include "ui/events/keycodes/dom3/dom_code.h" 7 #include "ui/events/keycodes/dom3/dom_code.h"
8 #include "ui/events/keycodes/dom3/dom_key.h" 8 #include "ui/events/keycodes/dom3/dom_key.h"
9 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 9 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
10 #include "ui/events/ozone/layout/layout_util.h" 10 #include "ui/events/ozone/layout/layout_util.h"
11 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h" 11 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 namespace { 15 namespace {
16 16
17 // This XkbKeyCodeConverter simply uses the numeric value of the DomCode. 17 // This XkbKeyCodeConverter simply uses the numeric value of the DomCode.
18 class VkTestXkbKeyCodeConverter : public XkbKeyCodeConverter { 18 class VkTestXkbKeyCodeConverter : public XkbKeyCodeConverter {
19 public: 19 public:
20 VkTestXkbKeyCodeConverter() { 20 VkTestXkbKeyCodeConverter() {
21 invalid_xkb_keycode_ = static_cast<xkb_keycode_t>(DomCode::NONE); 21 invalid_xkb_keycode_ = static_cast<xkb_keycode_t>(DomCode::NONE);
22 } 22 }
23 virtual ~VkTestXkbKeyCodeConverter(){} 23 ~VkTestXkbKeyCodeConverter() override {}
24 virtual xkb_keycode_t DomCodeToXkbKeyCode(DomCode dom_code) const override { 24 xkb_keycode_t DomCodeToXkbKeyCode(DomCode dom_code) const override {
25 return static_cast<xkb_keycode_t>(dom_code); 25 return static_cast<xkb_keycode_t>(dom_code);
26 } 26 }
27 }; 27 };
28 28
29 // This mock XkbKeyboardLayoutEngine fakes a layout that succeeds only when the 29 // This mock XkbKeyboardLayoutEngine fakes a layout that succeeds only when the
30 // supplied keycode matches its |Entry|, in which case it supplies DomKey::NONE 30 // supplied keycode matches its |Entry|, in which case it supplies DomKey::NONE
31 // and a character that depends on the flags. 31 // and a character that depends on the flags.
32 class VkTestXkbKeyboardLayoutEngine : public XkbKeyboardLayoutEngine { 32 class VkTestXkbKeyboardLayoutEngine : public XkbKeyboardLayoutEngine {
33 public: 33 public:
34 struct Entry { 34 struct Entry {
(...skipping 16 matching lines...) Expand all
51 // For testing, use the same modifier values as ui::EventFlags. 51 // For testing, use the same modifier values as ui::EventFlags.
52 static const int kTestFlags[] = { 52 static const int kTestFlags[] = {
53 EF_SHIFT_DOWN, EF_ALTGR_DOWN, EF_MOD3_DOWN}; 53 EF_SHIFT_DOWN, EF_ALTGR_DOWN, EF_MOD3_DOWN};
54 xkb_flag_map_.clear(); 54 xkb_flag_map_.clear();
55 xkb_flag_map_.resize(arraysize(kTestFlags)); 55 xkb_flag_map_.resize(arraysize(kTestFlags));
56 for (size_t i = 0; i < arraysize(kTestFlags); ++i) { 56 for (size_t i = 0; i < arraysize(kTestFlags); ++i) {
57 XkbFlagMapEntry e = {kTestFlags[i], kTestFlags[i]}; 57 XkbFlagMapEntry e = {kTestFlags[i], kTestFlags[i]};
58 xkb_flag_map_.push_back(e); 58 xkb_flag_map_.push_back(e);
59 } 59 }
60 } 60 }
61 virtual ~VkTestXkbKeyboardLayoutEngine() {} 61 ~VkTestXkbKeyboardLayoutEngine() override {}
62 62
63 void SetEntry(const Entry* entry) { entry_ = entry; } 63 void SetEntry(const Entry* entry) { entry_ = entry; }
64 64
65 xkb_keysym_t CharacterToKeySym(base::char16 c) const { 65 xkb_keysym_t CharacterToKeySym(base::char16 c) const {
66 return 0x01000000u + c; 66 return 0x01000000u + c;
67 } 67 }
68 68
69 KeyboardCode GetKeyboardCode(DomCode dom_code, 69 KeyboardCode GetKeyboardCode(DomCode dom_code,
70 int flags, 70 int flags,
71 base::char16 character) const { 71 base::char16 character) const {
72 KeyboardCode key_code = DifficultKeyboardCode( 72 KeyboardCode key_code = DifficultKeyboardCode(
73 dom_code, flags, key_code_converter_.DomCodeToXkbKeyCode(dom_code), 73 dom_code, flags, key_code_converter_.DomCodeToXkbKeyCode(dom_code),
74 flags, CharacterToKeySym(character), DomKey::CHARACTER, character); 74 flags, CharacterToKeySym(character), DomKey::CHARACTER, character);
75 if (key_code == VKEY_UNKNOWN) 75 if (key_code == VKEY_UNKNOWN)
76 key_code = DomCodeToNonLocatedKeyboardCode(dom_code); 76 key_code = DomCodeToNonLocatedKeyboardCode(dom_code);
77 return key_code; 77 return key_code;
78 } 78 }
79 79
80 // XkbKeyboardLayoutEngine overrides: 80 // XkbKeyboardLayoutEngine overrides:
81 virtual bool XkbLookup(xkb_keycode_t xkb_keycode, 81 bool XkbLookup(xkb_keycode_t xkb_keycode,
82 xkb_mod_mask_t xkb_flags, 82 xkb_mod_mask_t xkb_flags,
83 xkb_keysym_t* xkb_keysym, 83 xkb_keysym_t* xkb_keysym,
84 base::char16* character) const override { 84 base::char16* character) const override {
85 if (!entry_ || 85 if (!entry_ ||
86 (xkb_keycode != static_cast<xkb_keycode_t>(entry_->dom_code))) 86 (xkb_keycode != static_cast<xkb_keycode_t>(entry_->dom_code)))
87 return false; 87 return false;
88 if (xkb_flags & EF_ALTGR_DOWN) 88 if (xkb_flags & EF_ALTGR_DOWN)
89 *character = entry_->altgr_character; 89 *character = entry_->altgr_character;
90 else if (xkb_flags & EF_SHIFT_DOWN) 90 else if (xkb_flags & EF_SHIFT_DOWN)
91 *character = entry_->shift_character; 91 *character = entry_->shift_character;
92 else 92 else
93 *character = entry_->plain_character; 93 *character = entry_->plain_character;
94 *xkb_keysym = CharacterToKeySym(*character); 94 *xkb_keysym = CharacterToKeySym(*character);
95 return *character != 0; 95 return *character != 0;
96 } 96 }
97 97
98 private: 98 private:
99 const Entry* entry_; 99 const Entry* entry_;
100 }; 100 };
101 101
102 } // anonymous namespace 102 } // anonymous namespace
103 103
104 class XkbLayoutEngineVkTest : public testing::Test { 104 class XkbLayoutEngineVkTest : public testing::Test {
105 public: 105 public:
106 XkbLayoutEngineVkTest() {} 106 XkbLayoutEngineVkTest() {}
107 virtual ~XkbLayoutEngineVkTest() {} 107 ~XkbLayoutEngineVkTest() override {}
108 108
109 void SetUp() override { 109 void SetUp() override {
110 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( 110 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
111 make_scoped_ptr(new VkTestXkbKeyboardLayoutEngine(keycode_converter_))); 111 make_scoped_ptr(new VkTestXkbKeyboardLayoutEngine(keycode_converter_)));
112 layout_engine_ = static_cast<VkTestXkbKeyboardLayoutEngine*>( 112 layout_engine_ = static_cast<VkTestXkbKeyboardLayoutEngine*>(
113 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()); 113 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine());
114 } 114 }
115 void TearDown() override {} 115 void TearDown() override {}
116 116
117 protected: 117 protected:
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 std::string layout_id; 810 std::string layout_id;
811 std::string layout_variant; 811 std::string layout_variant;
812 XkbKeyboardLayoutEngine::ParseLayoutName(e->layout_name, &layout_id, 812 XkbKeyboardLayoutEngine::ParseLayoutName(e->layout_name, &layout_id,
813 &layout_variant); 813 &layout_variant);
814 EXPECT_EQ(layout_id, e->layout); 814 EXPECT_EQ(layout_id, e->layout);
815 EXPECT_EQ(layout_variant, e->variant); 815 EXPECT_EQ(layout_variant, e->variant);
816 } 816 }
817 } 817 }
818 818
819 } // namespace ui 819 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698