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

Unified Diff: chrome/browser/chromeos/events/event_rewriter_unittest.cc

Issue 1000713003: Remove special key rewrite code for x11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/events/event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index 2467cc482a9eae26a31a46665b7c5959535224cf..bae1131a5190aa3f6d9ed00f7552d16d11f2f576 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -115,14 +115,10 @@ void CheckX11KeyTestCase(const std::string& expected,
ui::KeyEvent& rewritten_key_event =
new_event ? *static_cast<ui::KeyEvent*>(new_event.get()) : xkey_event;
EXPECT_EQ(expected, GetKeyEventAsString(rewritten_key_event));
- if ((rewritten_key_event.key_code() != ui::VKEY_UNKNOWN) &&
- (rewritten_key_event.native_event()->xkey.keycode != 0)) {
- // Build a new ui::KeyEvent from the rewritten native component,
- // and check that it also matches the rewritten event.
- EXPECT_TRUE(rewritten_key_event.native_event());
- ui::KeyEvent from_native_event(rewritten_key_event.native_event());
- EXPECT_EQ(expected, GetKeyEventAsString(from_native_event));
- }
+ if (xevent->type == GenericEvent)
+ EXPECT_EQ(nullptr, rewritten_key_event.native_event());
+ else
+ EXPECT_NE(nullptr, rewritten_key_event.native_event());
}
#endif
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698