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

Side by Side Diff: ui/aura/test/aura_test_base.h

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/aura/scoped_window_targeter.h ('k') | ui/aura/test/event_generator_delegate_aura.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 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_ 5 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/aura/test/aura_test_helper.h" 12 #include "ui/aura/test/aura_test_helper.h"
13 13
14 namespace aura { 14 namespace aura {
15 class Window; 15 class Window;
16 class WindowDelegate; 16 class WindowDelegate;
17 namespace test { 17 namespace test {
18 18
19 // A base class for aura unit tests. 19 // A base class for aura unit tests.
20 // TODO(beng): Instances of this test will create and own a RootWindow. 20 // TODO(beng): Instances of this test will create and own a RootWindow.
21 class AuraTestBase : public testing::Test { 21 class AuraTestBase : public testing::Test {
22 public: 22 public:
23 AuraTestBase(); 23 AuraTestBase();
24 virtual ~AuraTestBase(); 24 virtual ~AuraTestBase();
25 25
26 // testing::Test: 26 // testing::Test:
27 virtual void SetUp() OVERRIDE; 27 virtual void SetUp() override;
28 virtual void TearDown() OVERRIDE; 28 virtual void TearDown() override;
29 29
30 // Creates a normal window parented to |parent|. 30 // Creates a normal window parented to |parent|.
31 aura::Window* CreateNormalWindow(int id, Window* parent, 31 aura::Window* CreateNormalWindow(int id, Window* parent,
32 aura::WindowDelegate* delegate); 32 aura::WindowDelegate* delegate);
33 33
34 protected: 34 protected:
35 void RunAllPendingInMessageLoop(); 35 void RunAllPendingInMessageLoop();
36 36
37 void ParentWindow(Window* window); 37 void ParentWindow(Window* window);
38 38
(...skipping 12 matching lines...) Expand all
51 base::MessageLoopForUI message_loop_; 51 base::MessageLoopForUI message_loop_;
52 scoped_ptr<AuraTestHelper> helper_; 52 scoped_ptr<AuraTestHelper> helper_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(AuraTestBase); 54 DISALLOW_COPY_AND_ASSIGN(AuraTestBase);
55 }; 55 };
56 56
57 } // namespace test 57 } // namespace test
58 } // namespace aura 58 } // namespace aura
59 59
60 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ 60 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ui/aura/scoped_window_targeter.h ('k') | ui/aura/test/event_generator_delegate_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698