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_APPLICATION_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 private: | 59 private: |
60 friend class WmTestBase; | 60 friend class WmTestBase; |
61 friend class WmTestHelper; | 61 friend class WmTestHelper; |
62 | 62 |
63 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); | 63 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); |
64 | 64 |
65 void InitWindowManager(ui::WindowTreeClient* window_tree_client); | 65 void InitWindowManager(ui::WindowTreeClient* window_tree_client); |
66 | 66 |
67 // shell::Service: | 67 // shell::Service: |
68 void OnStart(const shell::Identity& identity) override; | 68 void OnStart(const shell::Identity& identity) override; |
69 bool OnConnect(shell::Connection* connection) override; | 69 bool OnConnect(const shell::Identity& remote_identity, |
| 70 shell::InterfaceRegistry* registry) override; |
70 | 71 |
71 // shell::InterfaceFactory<mojom::ShelfLayout>: | 72 // shell::InterfaceFactory<mojom::ShelfLayout>: |
72 void Create(const shell::Identity& remote_identity, | 73 void Create(const shell::Identity& remote_identity, |
73 mojo::InterfaceRequest<mojom::ShelfLayout> request) override; | 74 mojo::InterfaceRequest<mojom::ShelfLayout> request) override; |
74 | 75 |
75 // shell::InterfaceFactory<mojom::UserWindowController>: | 76 // shell::InterfaceFactory<mojom::UserWindowController>: |
76 void Create( | 77 void Create( |
77 const shell::Identity& remote_identity, | 78 const shell::Identity& remote_identity, |
78 mojo::InterfaceRequest<mojom::UserWindowController> request) override; | 79 mojo::InterfaceRequest<mojom::UserWindowController> request) override; |
79 | 80 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 mojo::Binding<mash::session::mojom::ScreenlockStateListener> | 120 mojo::Binding<mash::session::mojom::ScreenlockStateListener> |
120 screenlock_state_listener_binding_; | 121 screenlock_state_listener_binding_; |
121 | 122 |
122 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 123 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
123 }; | 124 }; |
124 | 125 |
125 } // namespace mus | 126 } // namespace mus |
126 } // namespace ash | 127 } // namespace ash |
127 | 128 |
128 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 129 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
OLD | NEW |