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

Side by Side Diff: ash/mus/test/wm_test_base.h

Issue 2322613002: Adds support for multiple displays to WmTestBase (Closed)
Patch Set: feedback Created 4 years, 3 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 | « ash/mus/BUILD.gn ('k') | ash/mus/test/wm_test_base.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 ASH_MUS_TEST_WM_TEST_BASE_H_ 5 #ifndef ASH_MUS_TEST_WM_TEST_BASE_H_
6 #define ASH_MUS_TEST_WM_TEST_BASE_H_ 6 #define ASH_MUS_TEST_WM_TEST_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // Creates a window parented to |parent|. The returned window is visible. 62 // Creates a window parented to |parent|. The returned window is visible.
63 ui::Window* CreateChildTestWindow(ui::Window* parent, 63 ui::Window* CreateChildTestWindow(ui::Window* parent,
64 const gfx::Rect& bounds); 64 const gfx::Rect& bounds);
65 65
66 protected: 66 protected:
67 // testing::Test: 67 // testing::Test:
68 void SetUp() override; 68 void SetUp() override;
69 void TearDown() override; 69 void TearDown() override;
70 70
71 private: 71 private:
72 // Returns the RootWindowControllers ordered by display id (which we assume
73 // correlates with creation order).
74 std::vector<RootWindowController*> GetRootsOrderedByDisplayId();
75
76 bool setup_called_ = false; 72 bool setup_called_ = false;
77 bool teardown_called_ = false; 73 bool teardown_called_ = false;
78 std::unique_ptr<WmTestHelper> test_helper_; 74 std::unique_ptr<WmTestHelper> test_helper_;
79 75
80 DISALLOW_COPY_AND_ASSIGN(WmTestBase); 76 DISALLOW_COPY_AND_ASSIGN(WmTestBase);
81 }; 77 };
82 78
83 } // namespace mus 79 } // namespace mus
84 } // namespace ash 80 } // namespace ash
85 81
86 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_ 82 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698