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

Side by Side Diff: ui/events/gestures/gesture_provider_aura_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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "ui/events/event_utils.h" 8 #include "ui/events/event_utils.h"
9 #include "ui/events/gestures/gesture_provider_aura.h" 9 #include "ui/events/gestures/gesture_provider_aura.h"
10 10
11 namespace ui { 11 namespace ui {
12 12
13 class GestureProviderAuraTest : public testing::Test, 13 class GestureProviderAuraTest : public testing::Test,
14 public GestureProviderAuraClient { 14 public GestureProviderAuraClient {
15 public: 15 public:
16 GestureProviderAuraTest() {} 16 GestureProviderAuraTest() {}
17 17
18 virtual ~GestureProviderAuraTest() {} 18 virtual ~GestureProviderAuraTest() {}
19 19
20 virtual void OnGestureEvent(GestureEvent* event) OVERRIDE {} 20 virtual void OnGestureEvent(GestureEvent* event) override {}
21 21
22 virtual void SetUp() OVERRIDE { 22 virtual void SetUp() override {
23 provider_.reset(new GestureProviderAura(this)); 23 provider_.reset(new GestureProviderAura(this));
24 } 24 }
25 25
26 virtual void TearDown() OVERRIDE { provider_.reset(); } 26 virtual void TearDown() override { provider_.reset(); }
27 27
28 GestureProviderAura* provider() { return provider_.get(); } 28 GestureProviderAura* provider() { return provider_.get(); }
29 29
30 private: 30 private:
31 scoped_ptr<GestureProviderAura> provider_; 31 scoped_ptr<GestureProviderAura> provider_;
32 base::MessageLoopForUI message_loop_; 32 base::MessageLoopForUI message_loop_;
33 }; 33 };
34 34
35 TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) { 35 TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) {
36 base::TimeDelta time = ui::EventTimeForNow(); 36 base::TimeDelta time = ui::EventTimeForNow();
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 0, 143 0,
144 kTouchId0, 144 kTouchId0,
145 time, 145 time,
146 kRadiusX, 146 kRadiusX,
147 kRadiusY + 1, 147 kRadiusY + 1,
148 kAngle, 148 kAngle,
149 kForce); 149 kForce);
150 } 150 }
151 151
152 } // namespace ui 152 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/gestures/gesture_provider_aura.h ('k') | ui/events/gestures/gesture_recognizer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698