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_H_ | 5 #ifndef MASH_WM_WINDOW_MANAGER_H_ |
6 #define MASH_WM_WINDOW_MANAGER_H_ | 6 #define MASH_WM_WINDOW_MANAGER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "components/mus/common/types.h" | 13 #include "components/mus/common/types.h" |
12 #include "components/mus/public/cpp/window_manager_delegate.h" | 14 #include "components/mus/public/cpp/window_manager_delegate.h" |
13 #include "components/mus/public/cpp/window_observer.h" | 15 #include "components/mus/public/cpp/window_observer.h" |
14 #include "components/mus/public/interfaces/window_manager.mojom.h" | 16 #include "components/mus/public/interfaces/window_manager.mojom.h" |
15 #include "mash/session/public/interfaces/session.mojom.h" | 17 #include "mash/session/public/interfaces/session.mojom.h" |
16 #include "mojo/public/cpp/bindings/binding.h" | 18 #include "mojo/public/cpp/bindings/binding.h" |
17 | 19 |
18 namespace mash { | 20 namespace mash { |
19 namespace wm { | 21 namespace wm { |
(...skipping 21 matching lines...) Expand all Loading... |
41 mus::Window* NewTopLevelWindow( | 43 mus::Window* NewTopLevelWindow( |
42 std::map<std::string, std::vector<uint8_t>>* properties); | 44 std::map<std::string, std::vector<uint8_t>>* properties); |
43 | 45 |
44 // mus::WindowObserver: | 46 // mus::WindowObserver: |
45 void OnTreeChanging(const TreeChangeParams& params) override; | 47 void OnTreeChanging(const TreeChangeParams& params) override; |
46 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override; | 48 void OnWindowEmbeddedAppDisconnected(mus::Window* window) override; |
47 | 49 |
48 // WindowManagerDelegate: | 50 // WindowManagerDelegate: |
49 void SetWindowManagerClient(mus::WindowManagerClient* client) override; | 51 void SetWindowManagerClient(mus::WindowManagerClient* client) override; |
50 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; | 52 bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override; |
51 bool OnWmSetProperty(mus::Window* window, | 53 bool OnWmSetProperty( |
52 const std::string& name, | 54 mus::Window* window, |
53 scoped_ptr<std::vector<uint8_t>>* new_data) override; | 55 const std::string& name, |
| 56 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
54 mus::Window* OnWmCreateTopLevelWindow( | 57 mus::Window* OnWmCreateTopLevelWindow( |
55 std::map<std::string, std::vector<uint8_t>>* properties) override; | 58 std::map<std::string, std::vector<uint8_t>>* properties) override; |
56 void OnAccelerator(uint32_t id, const ui::Event& event) override; | 59 void OnAccelerator(uint32_t id, const ui::Event& event) override; |
57 | 60 |
58 // session::mojom::ScreenlockStateListener: | 61 // session::mojom::ScreenlockStateListener: |
59 void ScreenlockStateChanged(bool locked) override; | 62 void ScreenlockStateChanged(bool locked) override; |
60 | 63 |
61 RootWindowController* root_controller_; | 64 RootWindowController* root_controller_; |
62 mus::WindowManagerClient* window_manager_client_; | 65 mus::WindowManagerClient* window_manager_client_; |
63 | 66 |
64 mojo::Binding<session::mojom::ScreenlockStateListener> binding_; | 67 mojo::Binding<session::mojom::ScreenlockStateListener> binding_; |
65 | 68 |
66 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 69 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
67 }; | 70 }; |
68 | 71 |
69 } // namespace wm | 72 } // namespace wm |
70 } // namespace mash | 73 } // namespace mash |
71 | 74 |
72 #endif // MASH_WM_WINDOW_MANAGER_H_ | 75 #endif // MASH_WM_WINDOW_MANAGER_H_ |
OLD | NEW |