Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_COMMON_TEST_ASH_TEST_H_ | 5 #ifndef ASH_COMMON_TEST_ASH_TEST_H_ |
| 6 #define ASH_COMMON_TEST_ASH_TEST_H_ | 6 #define ASH_COMMON_TEST_ASH_TEST_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 | 59 |
| 60 // Creates a top level visible window in the appropriate container. If | 60 // Creates a top level visible window in the appropriate container. If |
| 61 // |bounds_is_screen| is empty the window is added to the primary root window, | 61 // |bounds_is_screen| is empty the window is added to the primary root window, |
| 62 // otherwise the window is added to the display matching |bounds_in_screen|. | 62 // otherwise the window is added to the display matching |bounds_in_screen|. |
| 63 // |shell_window_id| is the shell window id to give to the new window. | 63 // |shell_window_id| is the shell window id to give to the new window. |
| 64 std::unique_ptr<WindowOwner> CreateTestWindow( | 64 std::unique_ptr<WindowOwner> CreateTestWindow( |
| 65 const gfx::Rect& bounds_in_screen = gfx::Rect(), | 65 const gfx::Rect& bounds_in_screen = gfx::Rect(), |
| 66 ui::wm::WindowType type = ui::wm::WINDOW_TYPE_NORMAL, | 66 ui::wm::WindowType type = ui::wm::WINDOW_TYPE_NORMAL, |
| 67 int shell_window_id = kShellWindowId_Invalid); | 67 int shell_window_id = kShellWindowId_Invalid); |
| 68 | 68 |
| 69 // Creates a visible window parented to |parent| with the specified bounds and | |
|
James Cook
2016/09/28 01:19:58
nit: document that it creates and shows. (I've bee
sky
2016/09/28 18:16:36
Doesn't the visible imply shows?
James Cook
2016/09/28 19:02:49
I guess, but I missed that. Up to you.
| |
| 70 // id. | |
| 71 std::unique_ptr<WindowOwner> CreateChildWindow( | |
| 72 WmWindow* parent, | |
| 73 const gfx::Rect& bounds = gfx::Rect(), | |
| 74 int shell_window_id = kShellWindowId_Invalid); | |
| 75 | |
| 69 // Returns the Display for the secondary display. It's assumed there is two | 76 // Returns the Display for the secondary display. It's assumed there is two |
| 70 // displays. | 77 // displays. |
| 71 display::Display GetSecondaryDisplay(); | 78 display::Display GetSecondaryDisplay(); |
| 72 | 79 |
| 73 // Sets the placement of the secondary display. Returns true if the secondary | 80 // Sets the placement of the secondary display. Returns true if the secondary |
| 74 // display can be moved, false otherwise. The false return value is temporary | 81 // display can be moved, false otherwise. The false return value is temporary |
| 75 // until mus fully supports this. | 82 // until mus fully supports this. |
| 76 bool SetSecondaryDisplayPlacement( | 83 bool SetSecondaryDisplayPlacement( |
| 77 display::DisplayPlacement::Position position, | 84 display::DisplayPlacement::Position position, |
| 78 int offset); | 85 int offset); |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 90 | 97 |
| 91 private: | 98 private: |
| 92 std::unique_ptr<AshTestImpl> test_impl_; | 99 std::unique_ptr<AshTestImpl> test_impl_; |
| 93 | 100 |
| 94 DISALLOW_COPY_AND_ASSIGN(AshTest); | 101 DISALLOW_COPY_AND_ASSIGN(AshTest); |
| 95 }; | 102 }; |
| 96 | 103 |
| 97 } // namespace ash | 104 } // namespace ash |
| 98 | 105 |
| 99 #endif // ASH_COMMON_TEST_ASH_TEST_H_ | 106 #endif // ASH_COMMON_TEST_ASH_TEST_H_ |
| OLD | NEW |