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

Side by Side Diff: ui/events/x/events_x_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
« no previous file with comments | « ui/events/test/test_event_target.h ('k') | ui/gfx/animation/animation.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <cstring> 5 #include <cstring>
6 #include <set> 6 #include <set>
7 7
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #include <X11/Xutil.h> 10 #include <X11/Xutil.h>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 return true; 78 return true;
79 } 79 }
80 80
81 } // namespace 81 } // namespace
82 82
83 class EventsXTest : public testing::Test { 83 class EventsXTest : public testing::Test {
84 public: 84 public:
85 EventsXTest() {} 85 EventsXTest() {}
86 virtual ~EventsXTest() {} 86 virtual ~EventsXTest() {}
87 87
88 virtual void SetUp() OVERRIDE { 88 virtual void SetUp() override {
89 DeviceDataManagerX11::CreateInstance(); 89 DeviceDataManagerX11::CreateInstance();
90 ui::TouchFactory::GetInstance()->ResetForTest(); 90 ui::TouchFactory::GetInstance()->ResetForTest();
91 } 91 }
92 private: 92 private:
93 DISALLOW_COPY_AND_ASSIGN(EventsXTest); 93 DISALLOW_COPY_AND_ASSIGN(EventsXTest);
94 }; 94 };
95 95
96 TEST_F(EventsXTest, ButtonEvents) { 96 TEST_F(EventsXTest, ButtonEvents) {
97 XEvent event; 97 XEvent event;
98 gfx::Point location(5, 10); 98 gfx::Point location(5, 10);
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 KeyEventTestApi test_event(&key_event); 633 KeyEventTestApi test_event(&key_event);
634 test_event.set_is_char(true); 634 test_event.set_is_char(true);
635 } 635 }
636 EXPECT_FALSE(key_event.flags() & ui::EF_IME_FABRICATED_KEY); 636 EXPECT_FALSE(key_event.flags() & ui::EF_IME_FABRICATED_KEY);
637 } 637 }
638 } 638 }
639 } 639 }
640 #endif 640 #endif
641 641
642 } // namespace ui 642 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/test/test_event_target.h ('k') | ui/gfx/animation/animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698