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

Side by Side Diff: ui/views/test/views_test_helper_aura.h

Issue 2471033005: Adds DesktopWindowTreeHostMus (Closed)
Patch Set: fix Created 4 years, 1 month 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
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 #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;
16
15 namespace client { 17 namespace client {
16 class ScreenPositionClient; 18 class ScreenPositionClient;
17 } 19 }
18 namespace test { 20 namespace test {
19 class AuraTestHelper; 21 class AuraTestHelper;
20 } 22 }
21 } 23 }
22 24
23 namespace base { 25 namespace base {
24 class MessageLoopForUI; 26 class MessageLoopForUI;
25 } 27 }
26 28
27 namespace views { 29 namespace views {
28 30
29 class ViewsTestHelperAura : public ViewsTestHelper { 31 class ViewsTestHelperAura : public ViewsTestHelper {
30 public: 32 public:
31 ViewsTestHelperAura(base::MessageLoopForUI* message_loop, 33 ViewsTestHelperAura(base::MessageLoopForUI* message_loop,
32 ui::ContextFactory* context_factory); 34 ui::ContextFactory* context_factory);
33 ~ViewsTestHelperAura() override; 35 ~ViewsTestHelperAura() override;
34 36
37 void EnableMusWithWindowTreeClient(
38 aura::WindowTreeClient* window_tree_client);
39
35 // Overridden from ViewsTestHelper: 40 // Overridden from ViewsTestHelper:
36 void SetUp() override; 41 void SetUp() override;
37 void TearDown() override; 42 void TearDown() override;
38 gfx::NativeWindow GetContext() override; 43 gfx::NativeWindow GetContext() override;
39 44
40 private: 45 private:
41 ui::ContextFactory* context_factory_; 46 ui::ContextFactory* context_factory_;
42 std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_; 47 std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_;
43 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 48 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
44 49
45 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura); 50 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura);
46 }; 51 };
47 52
48 } // namespace views 53 } // namespace views
49 54
50 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ 55 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698