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

Side by Side Diff: ash/tooltips/tooltip_controller_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/test/ui_controls_factory_ash.cc ('k') | ash/touch/touch_hud_debug.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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "ash/test/ash_test_base.h" 6 #include "ash/test/ash_test_base.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/aura/env.h" 8 #include "ui/aura/env.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/aura/window_event_dispatcher.h" 10 #include "ui/aura/window_event_dispatcher.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 aura::client::GetTooltipClient(Shell::GetPrimaryRootWindow())); 69 aura::client::GetTooltipClient(Shell::GetPrimaryRootWindow()));
70 } 70 }
71 71
72 } // namespace 72 } // namespace
73 73
74 class TooltipControllerTest : public AshTestBase { 74 class TooltipControllerTest : public AshTestBase {
75 public: 75 public:
76 TooltipControllerTest() {} 76 TooltipControllerTest() {}
77 virtual ~TooltipControllerTest() {} 77 virtual ~TooltipControllerTest() {}
78 78
79 virtual void SetUp() OVERRIDE { 79 virtual void SetUp() override {
80 AshTestBase::SetUp(); 80 AshTestBase::SetUp();
81 helper_.reset(new TooltipControllerTestHelper(GetController())); 81 helper_.reset(new TooltipControllerTestHelper(GetController()));
82 } 82 }
83 83
84 protected: 84 protected:
85 scoped_ptr<TooltipControllerTestHelper> helper_; 85 scoped_ptr<TooltipControllerTestHelper> helper_;
86 86
87 private: 87 private:
88 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest); 88 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest);
89 }; 89 };
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 // be able to show tooltips on the primary display. 168 // be able to show tooltips on the primary display.
169 ui::test::EventGenerator generator1(root_windows[0]); 169 ui::test::EventGenerator generator1(root_windows[0]);
170 generator1.MoveMouseRelativeTo(widget1->GetNativeView(), 170 generator1.MoveMouseRelativeTo(widget1->GetNativeView(),
171 view1->bounds().CenterPoint()); 171 view1->bounds().CenterPoint());
172 helper_->FireTooltipTimer(); 172 helper_->FireTooltipTimer();
173 EXPECT_TRUE(helper_->IsTooltipVisible()); 173 EXPECT_TRUE(helper_->IsTooltipVisible());
174 } 174 }
175 175
176 } // namespace test 176 } // namespace test
177 } // namespace ash 177 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ui_controls_factory_ash.cc ('k') | ash/touch/touch_hud_debug.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698