| 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> |
| 11 #include <set> | 11 #include <set> |
| 12 | 12 |
| 13 #include "ash/common/wm/wm_toplevel_window_event_handler.h" |
| 13 #include "base/macros.h" | 14 #include "base/macros.h" |
| 14 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 15 #include "components/mus/common/types.h" | 16 #include "components/mus/common/types.h" |
| 16 #include "components/mus/public/cpp/window_manager_delegate.h" | 17 #include "components/mus/public/cpp/window_manager_delegate.h" |
| 17 #include "components/mus/public/cpp/window_observer.h" | 18 #include "components/mus/public/cpp/window_observer.h" |
| 18 #include "components/mus/public/cpp/window_tree_client_delegate.h" | 19 #include "components/mus/public/cpp/window_tree_client_delegate.h" |
| 19 #include "components/mus/public/interfaces/window_manager.mojom.h" | 20 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 20 | 21 |
| 21 namespace display { | 22 namespace display { |
| 22 class Display; | 23 class Display; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 } | 60 } |
| 60 | 61 |
| 61 shell::Connector* connector() { return connector_; } | 62 shell::Connector* connector() { return connector_; } |
| 62 | 63 |
| 63 void SetScreenLocked(bool is_locked); | 64 void SetScreenLocked(bool is_locked); |
| 64 | 65 |
| 65 // Creates a new top level window. | 66 // Creates a new top level window. |
| 66 ::mus::Window* NewTopLevelWindow( | 67 ::mus::Window* NewTopLevelWindow( |
| 67 std::map<std::string, std::vector<uint8_t>>* properties); | 68 std::map<std::string, std::vector<uint8_t>>* properties); |
| 68 | 69 |
| 70 // Called from WmMoveLoop to delete the object. |
| 71 void OnWmMoveLoopCompleted(uint32_t change_id, bool succeeded); |
| 72 |
| 69 std::set<RootWindowController*> GetRootWindowControllers(); | 73 std::set<RootWindowController*> GetRootWindowControllers(); |
| 70 | 74 |
| 71 void AddRootWindowsObserver(RootWindowsObserver* observer); | 75 void AddRootWindowsObserver(RootWindowsObserver* observer); |
| 72 void RemoveRootWindowsObserver(RootWindowsObserver* observer); | 76 void RemoveRootWindowsObserver(RootWindowsObserver* observer); |
| 73 | 77 |
| 74 private: | 78 private: |
| 75 friend class WmTestHelper; | 79 friend class WmTestHelper; |
| 76 | 80 |
| 77 void AddAccelerators(); | 81 void AddAccelerators(); |
| 78 | 82 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 | 134 |
| 131 std::unique_ptr<WmLookupMus> lookup_; | 135 std::unique_ptr<WmLookupMus> lookup_; |
| 132 | 136 |
| 133 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 137 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 134 }; | 138 }; |
| 135 | 139 |
| 136 } // namespace mus | 140 } // namespace mus |
| 137 } // namespace ash | 141 } // namespace ash |
| 138 | 142 |
| 139 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 143 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |