| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_WINDOW_MANAGER_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_ |
| 6 #define ASH_MUS_WINDOW_MANAGER_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } | 84 } |
| 85 | 85 |
| 86 ::wm::FocusController* focus_controller() { return focus_controller_.get(); } | 86 ::wm::FocusController* focus_controller() { return focus_controller_.get(); } |
| 87 | 87 |
| 88 service_manager::Connector* connector() { return connector_; } | 88 service_manager::Connector* connector() { return connector_; } |
| 89 | 89 |
| 90 aura::PropertyConverter* property_converter() { | 90 aura::PropertyConverter* property_converter() { |
| 91 return property_converter_.get(); | 91 return property_converter_.get(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 void SetScreenLocked(bool is_locked); | |
| 95 | |
| 96 // Creates a new top level window. | 94 // Creates a new top level window. |
| 97 aura::Window* NewTopLevelWindow( | 95 aura::Window* NewTopLevelWindow( |
| 98 ui::mojom::WindowType window_type, | 96 ui::mojom::WindowType window_type, |
| 99 std::map<std::string, std::vector<uint8_t>>* properties); | 97 std::map<std::string, std::vector<uint8_t>>* properties); |
| 100 | 98 |
| 101 std::set<RootWindowController*> GetRootWindowControllers(); | 99 std::set<RootWindowController*> GetRootWindowControllers(); |
| 102 | 100 |
| 103 // Returns the next accelerator namespace id by value in |id|. Returns true | 101 // Returns the next accelerator namespace id by value in |id|. Returns true |
| 104 // if there is another slot available, false if all slots are taken up. | 102 // if there is another slot available, false if all slots are taken up. |
| 105 bool GetNextAcceleratorNamespaceId(uint16_t* id); | 103 bool GetNextAcceleratorNamespaceId(uint16_t* id); |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 | 210 |
| 213 std::unique_ptr<ScreenPositionController> screen_position_controller_; | 211 std::unique_ptr<ScreenPositionController> screen_position_controller_; |
| 214 | 212 |
| 215 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 213 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 216 }; | 214 }; |
| 217 | 215 |
| 218 } // namespace mus | 216 } // namespace mus |
| 219 } // namespace ash | 217 } // namespace ash |
| 220 | 218 |
| 221 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 219 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |