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

Unified Diff: ui/views/events/event_unittest.cc

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/events/event_aura.cc ('k') | ui/views/events/event_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/events/event_unittest.cc
===================================================================
--- ui/views/events/event_unittest.cc (revision 150588)
+++ ui/views/events/event_unittest.cc (working copy)
@@ -5,6 +5,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "base/basictypes.h"
+#include "ui/base/event.h"
#include "ui/views/events/event.h"
// Bug 99129.
@@ -16,6 +17,8 @@
#define MAYBE_KeyEventDirectUnicode KeyEventDirectUnicode
#endif
+// TODO(beng): move to src/ui/base/event_unittest.cc:
+
namespace views {
class EventTest : public testing::Test {
@@ -104,7 +107,8 @@
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestData); ++i) {
- KeyEvent key(ui::ET_KEY_PRESSED, kTestData[i].key_code, kTestData[i].flags);
+ ui::KeyEvent key(
+ ui::ET_KEY_PRESSED, kTestData[i].key_code, kTestData[i].flags);
EXPECT_EQ(kTestData[i].character, key.GetCharacter())
<< " Index:" << i << " key_code:" << kTestData[i].key_code;
EXPECT_EQ(kTestData[i].unmodified_character, key.GetUnmodifiedCharacter())
@@ -113,12 +117,12 @@
}
TEST_F(EventTest, MAYBE_KeyEventDirectUnicode) {
- KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, ui::EF_SHIFT_DOWN);
+ ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, ui::EF_SHIFT_DOWN);
key.set_character(0x1234U);
key.set_unmodified_character(0x4321U);
EXPECT_EQ(0x1234U, key.GetCharacter());
EXPECT_EQ(0x4321U, key.GetUnmodifiedCharacter());
- KeyEvent key2(ui::ET_KEY_RELEASED, ui::VKEY_UNKNOWN, ui::EF_CONTROL_DOWN);
+ ui::KeyEvent key2(ui::ET_KEY_RELEASED, ui::VKEY_UNKNOWN, ui::EF_CONTROL_DOWN);
key2.set_character(0x4321U);
key2.set_unmodified_character(0x1234U);
EXPECT_EQ(0x4321U, key2.GetCharacter());
« no previous file with comments | « ui/views/events/event_aura.cc ('k') | ui/views/events/event_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698