| 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 <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "ui/views/test/views_test_helper.h" | 12 #include "ui/views/test/views_test_helper.h" |
| 13 | 13 |
| 14 namespace aura { | 14 namespace aura { |
| 15 class WindowTreeClient; | 15 class WindowTreeClient; |
| 16 | 16 |
| 17 namespace client { | 17 namespace client { |
| 18 class ScreenPositionClient; | 18 class ScreenPositionClient; |
| 19 } | 19 } |
| 20 namespace test { | 20 namespace test { |
| 21 class AuraTestHelper; | 21 class AuraTestHelper; |
| 22 } | 22 } |
| 23 } | 23 } |
| 24 | 24 |
| 25 namespace base { | |
| 26 class MessageLoopForUI; | |
| 27 } | |
| 28 | |
| 29 namespace views { | 25 namespace views { |
| 30 | 26 |
| 31 class ViewsTestHelperAura : public ViewsTestHelper { | 27 class ViewsTestHelperAura : public ViewsTestHelper { |
| 32 public: | 28 public: |
| 33 ViewsTestHelperAura(base::MessageLoopForUI* message_loop, | 29 ViewsTestHelperAura(ui::ContextFactory* context_factory, |
| 34 ui::ContextFactory* context_factory, | |
| 35 ui::ContextFactoryPrivate* context_factory_private); | 30 ui::ContextFactoryPrivate* context_factory_private); |
| 36 ~ViewsTestHelperAura() override; | 31 ~ViewsTestHelperAura() override; |
| 37 | 32 |
| 38 void EnableMusWithWindowTreeClient( | 33 void EnableMusWithWindowTreeClient( |
| 39 aura::WindowTreeClient* window_tree_client); | 34 aura::WindowTreeClient* window_tree_client); |
| 40 | 35 |
| 41 // Overridden from ViewsTestHelper: | 36 // Overridden from ViewsTestHelper: |
| 42 void SetUp() override; | 37 void SetUp() override; |
| 43 void TearDown() override; | 38 void TearDown() override; |
| 44 gfx::NativeWindow GetContext() override; | 39 gfx::NativeWindow GetContext() override; |
| 45 | 40 |
| 46 private: | 41 private: |
| 47 ui::ContextFactory* context_factory_; | 42 ui::ContextFactory* context_factory_; |
| 48 ui::ContextFactoryPrivate* context_factory_private_; | 43 ui::ContextFactoryPrivate* context_factory_private_; |
| 49 std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_; | 44 std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_; |
| 50 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; | 45 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; |
| 51 | 46 |
| 52 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura); | 47 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura); |
| 53 }; | 48 }; |
| 54 | 49 |
| 55 } // namespace views | 50 } // namespace views |
| 56 | 51 |
| 57 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ | 52 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ |
| OLD | NEW |