| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 aura::client::CaptureClient* GetCaptureClient() override; | 135 aura::client::CaptureClient* GetCaptureClient() override; |
| 136 aura::PropertyConverter* GetPropertyConverter() override; | 136 aura::PropertyConverter* GetPropertyConverter() override; |
| 137 | 137 |
| 138 // WindowManagerDelegate: | 138 // WindowManagerDelegate: |
| 139 void SetWindowManagerClient(aura::WindowManagerClient* client) override; | 139 void SetWindowManagerClient(aura::WindowManagerClient* client) override; |
| 140 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; | 140 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; |
| 141 bool OnWmSetProperty( | 141 bool OnWmSetProperty( |
| 142 aura::Window* window, | 142 aura::Window* window, |
| 143 const std::string& name, | 143 const std::string& name, |
| 144 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 144 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
| 145 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; |
| 145 aura::Window* OnWmCreateTopLevelWindow( | 146 aura::Window* OnWmCreateTopLevelWindow( |
| 146 ui::mojom::WindowType window_type, | 147 ui::mojom::WindowType window_type, |
| 147 std::map<std::string, std::vector<uint8_t>>* properties) override; | 148 std::map<std::string, std::vector<uint8_t>>* properties) override; |
| 148 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, | 149 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, |
| 149 bool not_responding) override; | 150 bool not_responding) override; |
| 150 void OnWmWillCreateDisplay(const display::Display& display) override; | 151 void OnWmWillCreateDisplay(const display::Display& display) override; |
| 151 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, | 152 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, |
| 152 const display::Display& display) override; | 153 const display::Display& display) override; |
| 153 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; | 154 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; |
| 154 void OnWmDisplayModified(const display::Display& display) override; | 155 void OnWmDisplayModified(const display::Display& display) override; |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 // create the various test delegates rather than a member. | 202 // create the various test delegates rather than a member. |
| 202 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test_; | 203 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test_; |
| 203 | 204 |
| 204 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 205 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 205 }; | 206 }; |
| 206 | 207 |
| 207 } // namespace mus | 208 } // namespace mus |
| 208 } // namespace ash | 209 } // namespace ash |
| 209 | 210 |
| 210 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 211 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |