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

Side by Side Diff: ash/touch/touchscreen_util_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/touch/touch_transformer_controller.h ('k') | ash/virtual_keyboard_controller.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 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 <vector> 5 #include <vector>
6 6
7 #include "ash/display/display_info.h" 7 #include "ash/display/display_info.h"
8 #include "ash/touch/touchscreen_util.h" 8 #include "ash/touch/touchscreen_util.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 class TouchscreenUtilTest : public testing::Test { 13 class TouchscreenUtilTest : public testing::Test {
14 public: 14 public:
15 TouchscreenUtilTest() {} 15 TouchscreenUtilTest() {}
16 virtual ~TouchscreenUtilTest() {} 16 virtual ~TouchscreenUtilTest() {}
17 17
18 virtual void SetUp() OVERRIDE { 18 virtual void SetUp() override {
19 // Internal display will always match to internal touchscreen. If internal 19 // Internal display will always match to internal touchscreen. If internal
20 // touchscreen can't be detected, it is then associated to a touch screen 20 // touchscreen can't be detected, it is then associated to a touch screen
21 // with matching size. 21 // with matching size.
22 { 22 {
23 DisplayInfo display(1, std::string(), false); 23 DisplayInfo display(1, std::string(), false);
24 DisplayMode mode(gfx::Size(1920, 1080), 60.0, false, true); 24 DisplayMode mode(gfx::Size(1920, 1080), 60.0, false, true);
25 mode.native = true; 25 mode.native = true;
26 std::vector<DisplayMode> modes(1, mode); 26 std::vector<DisplayMode> modes(1, mode);
27 display.set_display_modes(modes); 27 display.set_display_modes(modes);
28 displays_.push_back(display); 28 displays_.push_back(display);
(...skipping 18 matching lines...) Expand all
47 { 47 {
48 DisplayInfo display(4, std::string(), false); 48 DisplayInfo display(4, std::string(), false);
49 DisplayMode mode(gfx::Size(1024, 768), 60.0, false, true); 49 DisplayMode mode(gfx::Size(1024, 768), 60.0, false, true);
50 mode.native = true; 50 mode.native = true;
51 std::vector<DisplayMode> modes(1, mode); 51 std::vector<DisplayMode> modes(1, mode);
52 display.set_display_modes(modes); 52 display.set_display_modes(modes);
53 displays_.push_back(display); 53 displays_.push_back(display);
54 } 54 }
55 } 55 }
56 56
57 virtual void TearDown() OVERRIDE { 57 virtual void TearDown() override {
58 displays_.clear(); 58 displays_.clear();
59 } 59 }
60 60
61 protected: 61 protected:
62 std::vector<DisplayInfo> displays_; 62 std::vector<DisplayInfo> displays_;
63 63
64 private: 64 private:
65 DISALLOW_COPY_AND_ASSIGN(TouchscreenUtilTest); 65 DISALLOW_COPY_AND_ASSIGN(TouchscreenUtilTest);
66 }; 66 };
67 67
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 AssociateTouchscreens(&displays_, devices); 133 AssociateTouchscreens(&displays_, devices);
134 134
135 // Internal touchscreen is always mapped to internal display. 135 // Internal touchscreen is always mapped to internal display.
136 EXPECT_EQ(2, displays_[0].touch_device_id()); 136 EXPECT_EQ(2, displays_[0].touch_device_id());
137 EXPECT_EQ(1, displays_[1].touch_device_id()); 137 EXPECT_EQ(1, displays_[1].touch_device_id());
138 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[2].touch_device_id()); 138 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[2].touch_device_id());
139 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[3].touch_device_id()); 139 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[3].touch_device_id());
140 } 140 }
141 141
142 } // namespace ash 142 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch/touch_transformer_controller.h ('k') | ash/virtual_keyboard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698