| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 const std::string& name, | 97 const std::string& name, |
| 98 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 98 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
| 99 ::mus::Window* OnWmCreateTopLevelWindow( | 99 ::mus::Window* OnWmCreateTopLevelWindow( |
| 100 std::map<std::string, std::vector<uint8_t>>* properties) override; | 100 std::map<std::string, std::vector<uint8_t>>* properties) override; |
| 101 void OnWmClientJankinessChanged( | 101 void OnWmClientJankinessChanged( |
| 102 const std::set<::mus::Window*>& client_windows, | 102 const std::set<::mus::Window*>& client_windows, |
| 103 bool not_responding) override; | 103 bool not_responding) override; |
| 104 void OnWmNewDisplay(::mus::Window* window, | 104 void OnWmNewDisplay(::mus::Window* window, |
| 105 const display::Display& display) override; | 105 const display::Display& display) override; |
| 106 void OnAccelerator(uint32_t id, const ui::Event& event) override; | 106 void OnAccelerator(uint32_t id, const ui::Event& event) override; |
| 107 void OnWmPerformMoveLoop(uint32_t change_id, |
| 108 uint32_t window_id, |
| 109 const gfx::Point& cursor_location) override; |
| 110 void OnWmCancelMoveLoop(uint32_t window_id) override; |
| 107 | 111 |
| 108 // TODO(sky): this is unfortunate, remove. | 112 // TODO(sky): this is unfortunate, remove. |
| 109 WindowManagerApplication* window_manager_app_; | 113 WindowManagerApplication* window_manager_app_; |
| 110 | 114 |
| 111 shell::Connector* connector_; | 115 shell::Connector* connector_; |
| 112 | 116 |
| 113 ::mus::WindowTreeClient* window_tree_client_ = nullptr; | 117 ::mus::WindowTreeClient* window_tree_client_ = nullptr; |
| 114 | 118 |
| 115 ::mus::WindowManagerClient* window_manager_client_ = nullptr; | 119 ::mus::WindowManagerClient* window_manager_client_ = nullptr; |
| 116 | 120 |
| 117 std::unique_ptr<ShadowController> shadow_controller_; | 121 std::unique_ptr<ShadowController> shadow_controller_; |
| 118 | 122 |
| 119 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_; | 123 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_; |
| 120 | 124 |
| 121 base::ObserverList<RootWindowsObserver> root_windows_observers_; | 125 base::ObserverList<RootWindowsObserver> root_windows_observers_; |
| 122 | 126 |
| 123 std::unique_ptr<display::Screen> screen_; | 127 std::unique_ptr<display::Screen> screen_; |
| 124 | 128 |
| 125 std::unique_ptr<WmShellMus> shell_; | 129 std::unique_ptr<WmShellMus> shell_; |
| 126 | 130 |
| 127 std::unique_ptr<WmLookupMus> lookup_; | 131 std::unique_ptr<WmLookupMus> lookup_; |
| 128 | 132 |
| 129 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 133 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 130 }; | 134 }; |
| 131 | 135 |
| 132 } // namespace mus | 136 } // namespace mus |
| 133 } // namespace ash | 137 } // namespace ash |
| 134 | 138 |
| 135 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 139 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |