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

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

Issue 2897663002: chromeos: makes it possible for windows to outlive WindowTreeClient (Closed)
Patch Set: cleanup Created 3 years, 7 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/test/aura_test_base.cc ('k') | ui/aura/test/aura_test_helper.cc » ('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_HELPER_H_ 5 #ifndef UI_AURA_TEST_AURA_TEST_HELPER_H_
6 #define UI_AURA_TEST_AURA_TEST_HELPER_H_ 6 #define UI_AURA_TEST_AURA_TEST_HELPER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // Makes aura target mus with a mock WindowTree (TestWindowTree). Must be 53 // Makes aura target mus with a mock WindowTree (TestWindowTree). Must be
54 // called before SetUp(). 54 // called before SetUp().
55 void EnableMusWithTestWindowTree( 55 void EnableMusWithTestWindowTree(
56 WindowTreeClientDelegate* window_tree_delegate, 56 WindowTreeClientDelegate* window_tree_delegate,
57 WindowManagerDelegate* window_manager_delegate); 57 WindowManagerDelegate* window_manager_delegate);
58 58
59 // Makes aura target mus with the specified WindowTreeClient. Must be called 59 // Makes aura target mus with the specified WindowTreeClient. Must be called
60 // before SetUp(). 60 // before SetUp().
61 void EnableMusWithWindowTreeClient(WindowTreeClient* window_tree_client); 61 void EnableMusWithWindowTreeClient(WindowTreeClient* window_tree_client);
62 62
63 // Deletes the WindowTreeClient now. Normally the WindowTreeClient is deleted
64 // at the right time and there is no need to call this. This is provided for
65 // testing shutdown ordering.
66 void DeleteWindowTreeClient();
67
63 // Creates and initializes (shows and sizes) the RootWindow for use in tests. 68 // Creates and initializes (shows and sizes) the RootWindow for use in tests.
64 void SetUp(ui::ContextFactory* context_factory, 69 void SetUp(ui::ContextFactory* context_factory,
65 ui::ContextFactoryPrivate* context_factory_private); 70 ui::ContextFactoryPrivate* context_factory_private);
66 71
67 // Clean up objects that are created for tests. This also deletes the Env 72 // Clean up objects that are created for tests. This also deletes the Env
68 // object. 73 // object.
69 void TearDown(); 74 void TearDown();
70 75
71 // Flushes message loop. 76 // Flushes message loop.
72 void RunAllPendingInMessageLoop(); 77 void RunAllPendingInMessageLoop();
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 128
124 WindowTreeClient* window_tree_client_ = nullptr; 129 WindowTreeClient* window_tree_client_ = nullptr;
125 130
126 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); 131 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper);
127 }; 132 };
128 133
129 } // namespace test 134 } // namespace test
130 } // namespace aura 135 } // namespace aura
131 136
132 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_ 137 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_base.cc ('k') | ui/aura/test/aura_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698