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 MASH_WM_WINDOW_MANAGER_IMPL_H_ | 5 #ifndef MASH_WM_WINDOW_MANAGER_IMPL_H_ |
6 #define MASH_WM_WINDOW_MANAGER_IMPL_H_ | 6 #define MASH_WM_WINDOW_MANAGER_IMPL_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 mus::mojom::WindowTreeClientPtr client); | 39 mus::mojom::WindowTreeClientPtr client); |
40 | 40 |
41 // mus::WindowObserver: | 41 // mus::WindowObserver: |
42 void OnTreeChanging(const TreeChangeParams& params) override; | 42 void OnTreeChanging(const TreeChangeParams& params) override; |
43 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override; | 43 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override; |
44 | 44 |
45 // mus::mojom::WindowManager: | 45 // mus::mojom::WindowManager: |
46 void OpenWindow(mus::mojom::WindowTreeClientPtr client, | 46 void OpenWindow(mus::mojom::WindowTreeClientPtr client, |
47 mojo::Map<mojo::String, mojo::Array<uint8_t>> | 47 mojo::Map<mojo::String, mojo::Array<uint8_t>> |
48 transport_properties) override; | 48 transport_properties) override; |
49 void GetConfig(const GetConfigCallback& callback) override; | |
50 | 49 |
51 // WindowManagerDelegate: | 50 // WindowManagerDelegate: |
| 51 void SetWindowManagerClient(mus::WindowManagerClient* client) override; |
52 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; | 52 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; |
53 bool OnWmSetProperty(mus::Window* window, | 53 bool OnWmSetProperty(mus::Window* window, |
54 const std::string& name, | 54 const std::string& name, |
55 scoped_ptr<std::vector<uint8_t>>* new_data) override; | 55 scoped_ptr<std::vector<uint8_t>>* new_data) override; |
56 mus::Window* OnWmCreateTopLevelWindow( | 56 mus::Window* OnWmCreateTopLevelWindow( |
57 std::map<std::string, std::vector<uint8_t>>* properties) override; | 57 std::map<std::string, std::vector<uint8_t>>* properties) override; |
58 | 58 |
59 WindowManagerApplication* state_; | 59 WindowManagerApplication* state_; |
| 60 mus::WindowManagerClient* window_manager_client_; |
60 | 61 |
61 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); | 62 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); |
62 }; | 63 }; |
63 | 64 |
64 } // namespace wm | 65 } // namespace wm |
65 } // namespace mash | 66 } // namespace mash |
66 | 67 |
67 #endif // MASH_WM_WINDOW_MANAGER_IMPL_H_ | 68 #endif // MASH_WM_WINDOW_MANAGER_IMPL_H_ |
OLD | NEW |