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

Side by Side Diff: ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
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 <linux/input.h> 5 #include <linux/input.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 51
52 } // namespace ui 52 } // namespace ui
53 53
54 // Test fixture. 54 // Test fixture.
55 class KeyEventConverterEvdevTest : public testing::Test { 55 class KeyEventConverterEvdevTest : public testing::Test {
56 public: 56 public:
57 KeyEventConverterEvdevTest() {} 57 KeyEventConverterEvdevTest() {}
58 58
59 // Overridden from testing::Test: 59 // Overridden from testing::Test:
60 virtual void SetUp() OVERRIDE { 60 virtual void SetUp() override {
61 61
62 // Set up pipe to satisfy message pump (unused). 62 // Set up pipe to satisfy message pump (unused).
63 int evdev_io[2]; 63 int evdev_io[2];
64 if (pipe(evdev_io)) 64 if (pipe(evdev_io))
65 PLOG(FATAL) << "failed pipe"; 65 PLOG(FATAL) << "failed pipe";
66 events_in_ = evdev_io[0]; 66 events_in_ = evdev_io[0];
67 events_out_ = evdev_io[1]; 67 events_out_ = evdev_io[1];
68 68
69 modifiers_ = new ui::EventModifiersEvdev(); 69 modifiers_ = new ui::EventModifiersEvdev();
70 device_ = new ui::MockKeyEventConverterEvdev(events_in_, modifiers_); 70 device_ = new ui::MockKeyEventConverterEvdev(events_in_, modifiers_);
71 } 71 }
72 virtual void TearDown() OVERRIDE { 72 virtual void TearDown() override {
73 delete device_; 73 delete device_;
74 delete modifiers_; 74 delete modifiers_;
75 close(events_in_); 75 close(events_in_);
76 close(events_out_); 76 close(events_out_);
77 } 77 }
78 78
79 ui::MockKeyEventConverterEvdev* device() { return device_; } 79 ui::MockKeyEventConverterEvdev* device() { return device_; }
80 ui::EventModifiersEvdev* modifiers() { return modifiers_; } 80 ui::EventModifiersEvdev* modifiers() { return modifiers_; }
81 81
82 private: 82 private:
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 event = dev->event(4); 342 event = dev->event(4);
343 EXPECT_EQ(ui::ET_KEY_PRESSED, event->type()); 343 EXPECT_EQ(ui::ET_KEY_PRESSED, event->type());
344 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code()); 344 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
345 EXPECT_EQ(0, event->flags()); 345 EXPECT_EQ(0, event->flags());
346 346
347 event = dev->event(5); 347 event = dev->event(5);
348 EXPECT_EQ(ui::ET_KEY_RELEASED, event->type()); 348 EXPECT_EQ(ui::ET_KEY_RELEASED, event->type());
349 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code()); 349 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
350 EXPECT_EQ(0, event->flags()); 350 EXPECT_EQ(0, event->flags());
351 } 351 }
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/key_event_converter_evdev.h ('k') | ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698