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

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

Issue 2503623002: Support creation of toplevel mus::Windows on separate displays (Closed)
Patch Set: Remove GetPrimary/SecondaryRootWindowController methods. 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 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 display::Display GetPrimaryDisplay(); 51 display::Display GetPrimaryDisplay();
52 display::Display GetSecondaryDisplay(); 52 display::Display GetSecondaryDisplay();
53 53
54 // Creates a top level window visible window in the appropriate container. 54 // Creates a top level window visible window in the appropriate container.
55 // NOTE: you can explicitly destroy the returned value if necessary, but it 55 // NOTE: you can explicitly destroy the returned value if necessary, but it
56 // will also be automatically destroyed when the WindowTreeClient is 56 // will also be automatically destroyed when the WindowTreeClient is
57 // destroyed. 57 // destroyed.
58 ui::Window* CreateTestWindow(const gfx::Rect& bounds); 58 ui::Window* CreateTestWindow(const gfx::Rect& bounds);
59 ui::Window* CreateTestWindow(const gfx::Rect& bounds, 59 ui::Window* CreateTestWindow(const gfx::Rect& bounds,
60 ui::wm::WindowType window_type); 60 ui::wm::WindowType window_type);
61 ui::Window* CreateFullscreenTestWindow(); 61
62 ui::Window* CreateFullscreenTestWindow(int64_t display_id);
mfomitchev 2016/11/18 21:23:40 Please put the default value (int64_t display_id =
thanhph 2016/11/21 14:37:53 Done.
62 63
63 // Creates a window parented to |parent|. The returned window is visible. 64 // Creates a window parented to |parent|. The returned window is visible.
64 ui::Window* CreateChildTestWindow(ui::Window* parent, 65 ui::Window* CreateChildTestWindow(ui::Window* parent,
65 const gfx::Rect& bounds); 66 const gfx::Rect& bounds);
66 67
67 protected: 68 protected:
68 // testing::Test: 69 // testing::Test:
69 void SetUp() override; 70 void SetUp() override;
70 void TearDown() override; 71 void TearDown() override;
71 72
72 private: 73 private:
73 friend class AshTestImplMus; 74 friend class AshTestImplMus;
74 75
75 bool setup_called_ = false; 76 bool setup_called_ = false;
76 bool teardown_called_ = false; 77 bool teardown_called_ = false;
77 std::unique_ptr<WmTestHelper> test_helper_; 78 std::unique_ptr<WmTestHelper> test_helper_;
78 79
79 DISALLOW_COPY_AND_ASSIGN(WmTestBase); 80 DISALLOW_COPY_AND_ASSIGN(WmTestBase);
80 }; 81 };
81 82
82 } // namespace mus 83 } // namespace mus
83 } // namespace ash 84 } // namespace ash
84 85
85 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_ 86 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698