OLD | NEW |
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 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ | 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ |
6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ | 6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 | 26 |
27 namespace views { | 27 namespace views { |
28 | 28 |
29 class ViewsTestHelperAura : public ViewsTestHelper { | 29 class ViewsTestHelperAura : public ViewsTestHelper { |
30 public: | 30 public: |
31 ViewsTestHelperAura(base::MessageLoopForUI* message_loop, | 31 ViewsTestHelperAura(base::MessageLoopForUI* message_loop, |
32 ui::ContextFactory* context_factory); | 32 ui::ContextFactory* context_factory); |
33 virtual ~ViewsTestHelperAura(); | 33 virtual ~ViewsTestHelperAura(); |
34 | 34 |
35 // Overridden from ViewsTestHelper: | 35 // Overridden from ViewsTestHelper: |
36 virtual void SetUp() OVERRIDE; | 36 virtual void SetUp() override; |
37 virtual void TearDown() OVERRIDE; | 37 virtual void TearDown() override; |
38 virtual gfx::NativeWindow GetContext() OVERRIDE; | 38 virtual gfx::NativeWindow GetContext() override; |
39 | 39 |
40 private: | 40 private: |
41 ui::ContextFactory* context_factory_; | 41 ui::ContextFactory* context_factory_; |
42 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; | 42 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; |
43 scoped_ptr<wm::WMState> wm_state_; | 43 scoped_ptr<wm::WMState> wm_state_; |
44 | 44 |
45 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura); | 45 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura); |
46 }; | 46 }; |
47 | 47 |
48 } // namespace views | 48 } // namespace views |
49 | 49 |
50 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ | 50 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ |
OLD | NEW |