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

Side by Side Diff: ash/mus/test/ash_test_impl_mus.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
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_ASH_TEST_IMPL_MUS_H_ 5 #ifndef ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
6 #define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ 6 #define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
7 7
8 #include "ash/common/test/ash_test_impl.h" 8 #include "ash/common/test/ash_test_impl.h"
9 #include "ash/mus/test/wm_test_base.h" 9 #include "ash/mus/test/wm_test_base.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 11
12 namespace ash { 12 namespace ash {
13 namespace mus { 13 namespace mus {
14 14
15 class WmTestBase; 15 class WmTestBase;
16 16
17 // Implementation of AshTestImpl for mus. 17 // Implementation of AshTestImpl for mus.
18 class AshTestImplMus : public AshTestImpl { 18 class AshTestImplMus : public AshTestImpl {
19 public: 19 public:
20 AshTestImplMus(); 20 AshTestImplMus();
21 ~AshTestImplMus() override; 21 ~AshTestImplMus() override;
22 22
23 // AshTestImpl: 23 // AshTestImpl:
24 void SetUp() override; 24 void SetUp() override;
25 void TearDown() override; 25 void TearDown() override;
26 bool SupportsMultipleDisplays() const override;
27 void UpdateDisplay(const std::string& display_spec) override; 26 void UpdateDisplay(const std::string& display_spec) override;
28 std::unique_ptr<WindowOwner> CreateTestWindow( 27 std::unique_ptr<WindowOwner> CreateTestWindow(
29 const gfx::Rect& bounds_in_screen, 28 const gfx::Rect& bounds_in_screen,
30 ui::wm::WindowType type, 29 ui::wm::WindowType type,
31 int shell_window_id) override; 30 int shell_window_id) override;
32 std::unique_ptr<WindowOwner> CreateToplevelTestWindow( 31 std::unique_ptr<WindowOwner> CreateToplevelTestWindow(
33 const gfx::Rect& bounds_in_screen, 32 const gfx::Rect& bounds_in_screen,
34 int shell_window_id) override; 33 int shell_window_id) override;
35 display::Display GetSecondaryDisplay() override; 34 display::Display GetSecondaryDisplay() override;
36 bool SetSecondaryDisplayPlacement( 35 bool SetSecondaryDisplayPlacement(
37 display::DisplayPlacement::Position position, 36 display::DisplayPlacement::Position position,
38 int offset) override; 37 int offset) override;
39 void ConfigureWidgetInitParamsForDisplay( 38 void ConfigureWidgetInitParamsForDisplay(
40 WmWindow* window, 39 WmWindow* window,
41 views::Widget::InitParams* init_params) override; 40 views::Widget::InitParams* init_params) override;
42 void AddTransientChild(WmWindow* parent, WmWindow* window) override; 41 void AddTransientChild(WmWindow* parent, WmWindow* window) override;
43 42
44 private: 43 private:
45 // TODO(sky): fold WmTestBase directly into this class when no more subclasses 44 // TODO(sky): fold WmTestBase directly into this class when no more subclasses
46 // of WmTestBase. 45 // of WmTestBase.
47 std::unique_ptr<WmTestBase> wm_test_base_; 46 std::unique_ptr<WmTestBase> wm_test_base_;
48 47
49 DISALLOW_COPY_AND_ASSIGN(AshTestImplMus); 48 DISALLOW_COPY_AND_ASSIGN(AshTestImplMus);
50 }; 49 };
51 50
52 } // namespace mus 51 } // namespace mus
53 } // namespace ash 52 } // namespace ash
54 53
55 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ 54 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
OLDNEW
« no previous file with comments | « ash/magnifier/partial_magnification_controller_unittest.cc ('k') | ash/mus/test/ash_test_impl_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698