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

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

Issue 2653593004: chromeos: Remove AshTestBase::SupportsMultipleDisplays (Closed)
Patch Set: Created 3 years, 11 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/test/ash_test_impl_mus.cc ('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 26 matching lines...) Expand all
37 class WmTestHelper; 37 class WmTestHelper;
38 38
39 // Base class for window manager tests that want to configure 39 // Base class for window manager tests that want to configure
40 // WindowTreeClient without a client to mus. 40 // WindowTreeClient without a client to mus.
41 // TODO(sky): nuke this. 41 // TODO(sky): nuke this.
42 class WmTestBase : public testing::Test { 42 class WmTestBase : public testing::Test {
43 public: 43 public:
44 WmTestBase(); 44 WmTestBase();
45 ~WmTestBase() override; 45 ~WmTestBase() override;
46 46
47 // TODO(sky): temporary until http://crbug.com/611563 is fixed.
48 bool SupportsMultipleDisplays() const;
49
50 // Update the display configuration as given in |display_spec|. 47 // Update the display configuration as given in |display_spec|.
51 // See test::DisplayManagerTestApi::UpdateDisplay for more details. 48 // See test::DisplayManagerTestApi::UpdateDisplay for more details.
52 void UpdateDisplay(const std::string& display_spec); 49 void UpdateDisplay(const std::string& display_spec);
53 50
54 aura::Window* GetPrimaryRootWindow(); 51 aura::Window* GetPrimaryRootWindow();
55 aura::Window* GetSecondaryRootWindow(); 52 aura::Window* GetSecondaryRootWindow();
56 53
57 display::Display GetPrimaryDisplay(); 54 display::Display GetPrimaryDisplay();
58 display::Display GetSecondaryDisplay(); 55 display::Display GetSecondaryDisplay();
59 56
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 std::unique_ptr<WmWindowTestApi::GlobalMinimumSizeLock> minimum_size_lock_; 89 std::unique_ptr<WmWindowTestApi::GlobalMinimumSizeLock> minimum_size_lock_;
93 std::unique_ptr<WmTestHelper> test_helper_; 90 std::unique_ptr<WmTestHelper> test_helper_;
94 91
95 DISALLOW_COPY_AND_ASSIGN(WmTestBase); 92 DISALLOW_COPY_AND_ASSIGN(WmTestBase);
96 }; 93 };
97 94
98 } // namespace mus 95 } // namespace mus
99 } // namespace ash 96 } // namespace ash
100 97
101 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_ 98 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/mus/test/ash_test_impl_mus.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698