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_MUS_ROOT_WINDOW_CONTROLLER_H_ | 5 #ifndef ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ |
6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ | 6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/mus/disconnected_app_handler.h" | 10 #include "ash/mus/disconnected_app_handler.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 WmRootWindowControllerMus* wm_root_window_controller() { | 51 WmRootWindowControllerMus* wm_root_window_controller() { |
52 return wm_root_window_controller_.get(); | 52 return wm_root_window_controller_.get(); |
53 } | 53 } |
54 | 54 |
55 ui::Window* NewTopLevelWindow( | 55 ui::Window* NewTopLevelWindow( |
56 std::map<std::string, std::vector<uint8_t>>* properties); | 56 std::map<std::string, std::vector<uint8_t>>* properties); |
57 | 57 |
58 WmWindowMus* GetWindowByShellWindowId(int id); | 58 WmWindowMus* GetWindowByShellWindowId(int id); |
59 | 59 |
60 void SetWorkAreaInests(const gfx::Insets& insets); | 60 void SetWorkAreaInests(const gfx::Insets& insets); |
| 61 void SetDisplay(const display::Display& display); |
61 | 62 |
62 WindowManager* window_manager() { return window_manager_; } | 63 WindowManager* window_manager() { return window_manager_; } |
63 | 64 |
64 const display::Display& display() const { return display_; } | 65 const display::Display& display() const { return display_; } |
65 | 66 |
66 WmShelfMus* wm_shelf() { return wm_shelf_.get(); } | 67 WmShelfMus* wm_shelf() { return wm_shelf_.get(); } |
67 | 68 |
68 private: | 69 private: |
69 friend class WmTestBase; | 70 friend class WmTestBase; |
70 friend class WmTestHelper; | 71 friend class WmTestHelper; |
(...skipping 17 matching lines...) Expand all Loading... |
88 | 89 |
89 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; | 90 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; |
90 | 91 |
91 DISALLOW_COPY_AND_ASSIGN(RootWindowController); | 92 DISALLOW_COPY_AND_ASSIGN(RootWindowController); |
92 }; | 93 }; |
93 | 94 |
94 } // namespace mus | 95 } // namespace mus |
95 } // namespace ash | 96 } // namespace ash |
96 | 97 |
97 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ | 98 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ |
OLD | NEW |